taxtank-core 0.31.41 → 0.31.42

package/lib/collections/property/property-category-movement.collection.d.ts

@@ -1,7 +1,5 @@
 import { Collection } from '../collection';
-import { PropertyCategoryMovement } from '../../models/property/property-category-movement';
-import { PropertyForecast } from '../../models/property/property-forecast';
-import { Property } from '../../models/property/property';
+import { Property, PropertyCategoryMovement, PropertyForecast } from '../../models';
 export declare class PropertyCategoryMovementCollection extends Collection<PropertyCategoryMovement> {
     /**
      * @TODO TT-2355 Alex refactor propertyForecast, use separated api (then I can remove property from param)

package/lib/db/Models/document/document.d.ts

@@ -1,12 +1,8 @@
 import { DocumentFolder } from './document-folder';
 import { AbstractModel } from '../abstract-model';
+import { File } from '../file';
 export declare class Document extends AbstractModel {
     id?: number;
-    name?: string;
-    originalName?: string;
-    size?: number;
-    mimeType?: string;
-    createdAt?: Date;
-    updatedAt?: Date;
+    file?: File;
     folder?: DocumentFolder;
 }

package/lib/interfaces/mp-trackable.interface.d.ts

@@ -1,5 +1,6 @@
+import { AbstractModel } from '../db/Models';
 export interface MpTrackableInterface {
-    get mpData(): {
+    getMpData(model?: AbstractModel): {
         [key: string]: any;
     };
 }

package/lib/models/budget/budget.d.ts

@@ -7,5 +7,5 @@ export declare class Budget extends BudgetBase implements MpTrackableInterface {
     rules: BudgetRule[];
     user: User;
     get rulesCollection(): Collection<BudgetRule>;
-    get mpData(): {};
+    getMpData(): {};
 }

package/lib/models/client/annual-client-details.d.ts

@@ -13,7 +13,7 @@ export declare class AnnualClientDetails extends AbstractModel implements MpTrac
     exemptForeignEmploymentIncome?: number;
     clientDetails: ClientDetails;
     get spouseMonthlyIncome(): number;
-    get mpData(): {
+    getMpData(): {
         capitalLoss: number;
         privateHealthCare: boolean;
         spouse: boolean;

package/lib/models/client/client-income-types.d.ts

@@ -5,7 +5,7 @@ export declare class ClientIncomeTypes extends ClientIncomeTypesBase implements
      * Get count of selected income types
      */
     get length(): number;
-    get mpData(): {
+    getMpData(): {
         work: boolean;
         property: boolean;
         sole: boolean;

package/lib/models/depreciation/depreciation-capital-project.d.ts

@@ -1,5 +1,10 @@
 import { DepreciationCapitalProject as DepreciationCapitalProjectBase } from '../../db/Models/depreciation/depreciation-capital-project';
-export declare class DepreciationCapitalProject extends DepreciationCapitalProjectBase {
-    propertyId: number;
+import { MpTrackableInterface } from '../../interfaces';
+import { Property } from '../property';
+export declare class DepreciationCapitalProject extends DepreciationCapitalProjectBase implements MpTrackableInterface {
     effectiveDate: Date;
+    getMpData(property: Property): {
+        Property: string;
+        Name: string;
+    };
 }

package/lib/models/document/document-folder.d.ts

@@ -1,3 +1,7 @@
 import { DocumentFolder as DocumentFolderBase } from '../../db/Models/document/document-folder';
-export declare class DocumentFolder extends DocumentFolderBase {
+import { MpTrackableInterface } from '../../interfaces';
+export declare class DocumentFolder extends DocumentFolderBase implements MpTrackableInterface {
+    getMpData(): {
+        Name: string;
+    };
 }

package/lib/models/document/document.d.ts

@@ -1,9 +1,11 @@
 import { Document as DocumentBase } from '../../db/Models/document/document';
 import { DocumentFolder } from './document-folder';
-import { DocumentInterface } from '../../interfaces/document.interface';
+import { DocumentInterface } from '../../interfaces';
 import { AppFile } from '../file';
-export declare class Document extends DocumentBase implements DocumentInterface {
+import { MpTrackableInterface } from '../../interfaces';
+export declare class Document extends DocumentBase implements DocumentInterface, MpTrackableInterface {
     folder: DocumentFolder;
     file: AppFile;
     get parent(): DocumentFolder;
+    getMpData(): {};
 }

package/lib/models/property/property-category-movement.d.ts

@@ -1,9 +1,15 @@
 import { PropertyCategoryMovement as PropertyCategoryMovementBase } from '../../db/Models/property/property-category-movement';
 import { PropertyValuation } from './property-valuation';
 import { PropertyCategory } from './property-category';
-export declare class PropertyCategoryMovement extends PropertyCategoryMovementBase {
+import { MpTrackableInterface } from '../../interfaces';
+import { Property } from './property';
+export declare class PropertyCategoryMovement extends PropertyCategoryMovementBase implements MpTrackableInterface {
     valuation: PropertyValuation;
     propertyCategory: PropertyCategory;
     fromDate: Date;
     toDate: Date;
+    getMpData(property: Property): {
+        Property: string;
+        Category: string;
+    };
 }

package/lib/models/property/property-category.d.ts

@@ -1,6 +1,10 @@
 import { PropertyCategory as PropertyCategoryBase } from '../../db/Models/property/property-category';
-export declare class PropertyCategory extends PropertyCategoryBase {
+import { MpTrackableInterface } from '../../interfaces';
+export declare class PropertyCategory extends PropertyCategoryBase implements MpTrackableInterface {
     isOwnerOccupied(): boolean;
     isVacantLand(): boolean;
     isShared(): boolean;
+    getMpData(): {
+        Name: string;
+    };
 }

package/lib/models/property/property-document.d.ts

@@ -1,9 +1,13 @@
 import { PropertyDocument as PropertyDocumentBase } from '../../db/Models/document/property-document';
-import { DocumentInterface } from '../../interfaces/document.interface';
+import { DocumentInterface } from '../../interfaces';
 import { Property } from './property';
 import { AppFile } from '../file';
-export declare class PropertyDocument extends PropertyDocumentBase implements DocumentInterface {
+import { MpTrackableInterface } from '../../interfaces';
+export declare class PropertyDocument extends PropertyDocumentBase implements DocumentInterface, MpTrackableInterface {
     property: Property;
     file: AppFile;
     get parent(): Property;
+    getMpData(property: Property): {
+        Property: string;
+    };
 }

package/lib/models/property/property-forecast.d.ts

@@ -1,5 +1,7 @@
 import { PropertyForecast as PropertyForecastBase } from '../../db/Models/property/property-forecast';
-export declare class PropertyForecast extends PropertyForecastBase {
+import { MpTrackableInterface } from '../../interfaces';
+import { Property } from './property';
+export declare class PropertyForecast extends PropertyForecastBase implements MpTrackableInterface {
     income: number;
     expense: number;
     interest: number;
@@ -26,4 +28,8 @@ export declare class PropertyForecast extends PropertyForecastBase {
      * Check if forecast is for real current fin year (not selected in the sidebar)
      */
     isCurrentYear(): boolean;
+    getMpData(property: Property): {
+        Property: string;
+        'Financial Year': number;
+    };
 }

package/lib/models/property/property-sale/property-sale.d.ts

@@ -1,7 +1,9 @@
 import { PropertySaleTaxExemptionMetaField, PropertyShare } from '../../../db/Models';
 import { TaxExemption } from './tax-exemption';
 import { AssetSale } from '../../asset-sale';
-export declare class PropertySale extends AssetSale {
+import { MpTrackableInterface } from '../../../interfaces';
+import { Property } from '../property';
+export declare class PropertySale extends AssetSale implements MpTrackableInterface {
     createdAt: Date;
     updatedAt: Date;
     share: PropertyShare;
@@ -23,4 +25,8 @@ export declare class PropertySale extends AssetSale {
      */
     isCGTApplicable(): boolean;
     get netPrice(): number;
+    getMpData(property: Property): {
+        Property: string;
+        Concession: string;
+    };
 }

package/lib/models/property/property-share.d.ts

@@ -1,8 +1,9 @@
 import { PropertyShare as PropertyShareBase } from '../../db/Models/property/property-share';
-import { User } from '../user/user';
+import { User } from '../user';
 import { RegistrationInvite } from '../registration-invite/registration-invite';
 import { Property } from './property';
-export declare class PropertyShare extends PropertyShareBase {
+import { MpTrackableInterface } from '../../interfaces';
+export declare class PropertyShare extends PropertyShareBase implements MpTrackableInterface {
     fromDate: Date;
     toDate: Date;
     user: User;
@@ -18,4 +19,8 @@ export declare class PropertyShare extends PropertyShareBase {
      * Otherwise - return first name from invitation
      */
     get userName(): string;
+    getMpData(): {
+        Property: string;
+        User: string;
+    };
 }

package/lib/models/property/property-subscription.d.ts

@@ -1,5 +1,5 @@
 import { PropertySubscription as PropertySubscriptionBase } from '../../db/Models/property/property-subscription';
-import { User } from '../user/user';
+import { User } from '../user';
 export declare class PropertySubscription extends PropertySubscriptionBase {
     createdAt: Date;
     user: User;

package/lib/models/property/property-valuation.d.ts

@@ -1,9 +1,15 @@
 import { PropertyValuation as PropertyValuationBase } from '../../db/Models/property/property-valuation';
 import { PropertyDocument } from './property-document';
-export declare class PropertyValuation extends PropertyValuationBase {
+import { MpTrackableInterface } from '../../interfaces';
+import { Property } from './property';
+export declare class PropertyValuation extends PropertyValuationBase implements MpTrackableInterface {
     date: Date;
     document: PropertyDocument;
     marketValue: number;
     get financialYear(): number;
     isCurrentYear(): boolean;
+    getMpData(property: Property): {
+        Property: string;
+        Date: Date;
+    };
 }

package/lib/models/property/property.d.ts

@@ -12,10 +12,11 @@ import { PropertySale } from './property-sale';
 import { unitOfTime } from 'moment';
 import { DepreciationCollection, TransactionCollection } from '../../collections';
 import { AppFile } from '../file';
+import { MpTrackableInterface } from '../../interfaces';
 /**
  * propertySale docs - https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4209508353/Property+Sold+button
  */
-export declare class Property extends PropertyBase {
+export declare class Property extends PropertyBase implements MpTrackableInterface {
     /**
      * Property acquired before 20 September 1985 will generally be treated as pre-Capital Gains Tax (CGT) assets.
      * Any assets acquired before this day are CGT exempt (because the tax didn't exist before this date).
@@ -101,4 +102,10 @@ export declare class Property extends PropertyBase {
     getTaxPosition(transactions: TransactionCollection, depreciations: DepreciationCollection): number;
     get monthlyIncome(): number;
     get monthlyExpense(): number;
+    getMpData(): {
+        Category: string;
+        Taxable: string;
+        Shared: string;
+        'Ownership %': string;
+    };
 }

package/lib/models/user/user.d.ts

@@ -67,7 +67,7 @@ export declare class User extends BaseUser implements MpTrackableInterface {
      * starts from 2022 for new users and registeredYear - 1 for old users
      */
     get financialYears(): number;
-    get mpData(): {
+    getMpData(): {
         clientDetails: {};
     };
 }

package/lib/models/user-event/user-event-setting.d.ts

@@ -4,7 +4,7 @@ import { MpTrackableInterface } from '../../interfaces';
 export declare class UserEventSetting extends UserEventSettingBase implements MpTrackableInterface {
     type: UserEventType;
     isUpdating?: boolean;
-    get mpData(): {
+    getMpData(): {
         type: string;
         byEmail: boolean;
         byNotification: boolean;

package/lib/services/http/depreciation/depreciation-capital-project/depreciation-capital-project.service.d.ts

@@ -1,20 +1,17 @@
-import { Observable, ReplaySubject } from 'rxjs';
-import { HttpClient } from '@angular/common/http';
-import { DepreciationCapitalProject } from '../../../../models/depreciation/depreciation-capital-project';
+import { DepreciationCapitalProject as DepreciationCapitalProjectBase } from '../../../../db/Models/depreciation/depreciation-capital-project';
+import { DepreciationCapitalProject } from '../../../../models';
+import { Collection } from '../../../../collections';
+import { RestMethod, RestService } from '../../rest';
 import * as i0 from "@angular/core";
 /**
  * Service for work with DepreciationCapitalProjects
+ * @TODO Alex: refactor with new rest when backend ready (TT-3571)
  */
-export declare class DepreciationCapitalProjectService {
-    private http;
-    private environment;
-    cache: DepreciationCapitalProject[];
-    cacheSubject: ReplaySubject<DepreciationCapitalProject[]>;
-    constructor(http: HttpClient, environment: any);
-    get(propertyId: number): Observable<DepreciationCapitalProject[]>;
-    add(capitalProject: DepreciationCapitalProject, propertyId: number): Observable<void>;
-    update(capitalProject: DepreciationCapitalProject, propertyId: number): Observable<void>;
-    delete(capitalProject: DepreciationCapitalProject, propertyId: number): Observable<void>;
+export declare class DepreciationCapitalProjectService extends RestService<DepreciationCapitalProjectBase, DepreciationCapitalProject, Collection<DepreciationCapitalProject>> {
+    modelClass: typeof DepreciationCapitalProject;
+    collectionClass: typeof Collection;
+    endpointUri: string;
+    disabledMethods: RestMethod[];
     static ɵfac: i0.ɵɵFactoryDeclaration<DepreciationCapitalProjectService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<DepreciationCapitalProjectService>;
 }

package/lib/services/http/property/property-category-movement/property-category-movement.service.d.ts

@@ -1,4 +1,4 @@
-import { PropertyCategoryMovement } from '../../../../models';
+import { Property, PropertyCategoryMovement } from '../../../../models';
 import { PropertyCategoryMovement as PropertyCategoryMovementBase } from '../../../../db/Models';
 import { RestMethod, RestService } from '../../rest';
 import { PropertyCategoryMovementCollection } from '../../../../collections';
@@ -9,7 +9,7 @@ export declare class PropertyCategoryMovementService extends RestService<Propert
     collectionClass: typeof PropertyCategoryMovementCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
-    post(movement: PropertyCategoryMovement): Observable<PropertyCategoryMovement>;
+    post(movement: PropertyCategoryMovement, property: Property): Observable<PropertyCategoryMovement>;
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertyCategoryMovementService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PropertyCategoryMovementService>;
 }

package/lib/services/http/property/property-share/property-share.service.d.ts

@@ -18,7 +18,7 @@ export declare class PropertyShareService extends RestService<PropertyShareBase,
      * Re-invite property share
      * @param share user to share property
      */
-    reinvite(share: PropertyShare): Observable<object>;
+    reinvite(share: PropertyShare): Observable<void>;
     /**
      * Listen to User updated event
      */

package/lib/services/http/property/property-valuation/property-valuation.service.d.ts

@@ -1,6 +1,6 @@
 import { RestMethod, RestService } from '../../rest';
 import { PropertyValuation as PropertyValuationBase } from '../../../../db/Models';
-import { PropertyValuation } from '../../../../models';
+import { Property, PropertyValuation } from '../../../../models';
 import { Collection } from '../../../../collections';
 import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
@@ -14,8 +14,8 @@ export declare class PropertyValuationService extends RestService<PropertyValuat
     disabledMethods: RestMethod[];
     protected isApiPlatform: boolean;
     get(propertyId: string): Observable<Collection<PropertyValuation>>;
-    post(valuation: PropertyValuation, propertyId: string): Observable<PropertyValuation>;
-    put(valuation: PropertyValuation, propertyId: string): Observable<PropertyValuation>;
+    post(valuation: PropertyValuation, property: Property): Observable<PropertyValuation>;
+    put(valuation: PropertyValuation, property: Property): Observable<PropertyValuation>;
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertyValuationService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PropertyValuationService>;
 }

package/lib/services/http/rest/rest.service.d.ts

@@ -58,7 +58,7 @@ export declare abstract class RestService<BaseModel, Model extends AbstractModel
     /**
      * Create a new Model instance in database
      */
-    post(model: Model, path?: string): Observable<Model>;
+    post(model: Model, mpData?: AbstractModel, path?: string): Observable<Model>;
     /**
      * Create multiple new Model instances in database
      */
@@ -66,7 +66,7 @@ export declare abstract class RestService<BaseModel, Model extends AbstractModel
     /**
      * Change an existing Model instance in database
      */
-    put(model: Model, path?: string): Observable<Model>;
+    put(model: Model, mpData?: AbstractModel, path?: string): Observable<Model>;
     /**
      * Change multiple existing Model instances in database
      */
@@ -74,17 +74,17 @@ export declare abstract class RestService<BaseModel, Model extends AbstractModel
     /**
      * Remove a Model instance from database
      */
-    delete(model: Model): Observable<void>;
+    delete(model: Model, mpData?: AbstractModel): Observable<void>;
     /**
      * Remove multiple Model instances from database
      */
     deleteBatch(models: Model[]): Observable<void>;
-    protected track(response: Model[], method: HttpMethod, postfix?: string): void;
-    protected handleResponseError(response: Model[], method: HttpMethod): void;
+    protected track(response: Model[], method: HttpMethod, mpData?: AbstractModel, postfix?: string): void;
+    protected handleResponseError(response: Model[], method: HttpMethod, mpData?: AbstractModel): void;
     /**
      * Handle response data - update cache and dispatch event if it is needed
      */
-    protected handleResponse(response: Model[], method: HttpMethod): void;
+    protected handleResponse(response: Model[], method: HttpMethod, mpData?: AbstractModel): void;
     /**
      * Update cache with passed items. Add/Update detects automatically, Delete via optional flag
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.31.41",
+  "version": "0.31.42",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^15.1.5",