taxtank-core 0.8.3 → 0.8.7

package/lib/collections/collection.d.ts

@@ -20,7 +20,7 @@ export declare class Collection<Model extends object> implements Iterable<Model>
      * Get list of items ids
      */
     getIds(): number[];
-    getOneBy(path: string, value: any): Model;
+    findBy(path: string, value: any): Model;
     getBy(path: string, value: any): this;
     /**
      * Get single item by id

package/lib/collections/{tax-return-category-item.collection.d.ts → tax-summary/report-item.collection.d.ts}

@@ -1,10 +1,10 @@
-import { Collection } from './collection';
-import { TaxReturnCategoryItem } from '../models/tax-summary/tax-return-category-item';
-import { TaxReturnCategorySectionEnum } from '../db/Enums/tax-return-category-section.enum';
+import { Collection } from '../collection';
+import { ReportItem } from '../../models/tax-summary/report-item';
+import { TaxReturnCategorySectionEnum } from '../../db/Enums/tax-return-category-section.enum';
 /**
  * collection for tax return category items
  */
-export declare class TaxReturnCategoryItemCollection extends Collection<TaxReturnCategoryItem> {
+export declare class ReportItemCollection extends Collection<ReportItem> {
     /**
      * Work income
      */
@@ -62,7 +62,7 @@ export declare class TaxReturnCategoryItemCollection extends Collection<TaxRetur
      * taxWithheld by section (work or other)
      */
     getTaxWithheld(section?: TaxReturnCategorySectionEnum): number;
-    getTaxCreditsCollection(): TaxReturnCategoryItemCollection;
+    getTaxCreditsCollection(): ReportItemCollection;
     getTotalAmountByIncomeSourceName(name: string): number;
     private getByCategory;
 }

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

@@ -80,6 +80,7 @@ export declare class Property extends PropertyBase implements Photoable, Documen
      * tax exemption can reduce cgt from 100% to less (up to zero)
      */
     getCGTExemptionRatio(sale: PropertySale): number;
+    isOneYearExemptionApplicable(sale: PropertySale): boolean;
     /**
      * ownership duration from purchase till sale
      */

package/lib/models/tax-summary/{tax-return-category-item-details.d.ts → report-item-details.d.ts}

@@ -1,11 +1,11 @@
 import { TaxReturnCategorySectionEnum } from '../../db/Enums/tax-return-category-section.enum';
 /**
  * Used in tax summary reports to show specific details relating to an amount in the report.
- * See structure in TaxReturnCategoryItem class.
+ * See structure in ReportItem class.
  * Example an amount of $550 for property income could be comprised of 2 different property amounts of $300 and $250.
  * This is useful in providing drill-down information for the tax summary report.
  */
-export declare class TaxReturnCategoryItemDetails {
+export declare class ReportItemDetails {
     amount: number;
     name: string;
     type: number;

package/lib/models/tax-summary/{tax-return-category-item.d.ts → report-item.d.ts}

@@ -1,13 +1,13 @@
 import { TaxReturnCategory } from '../../db/Models/tax-return-category';
-import { TaxReturnCategoryItemDetails } from './tax-return-category-item-details';
+import { ReportItemDetails } from './report-item-details';
 /**
  * Used in tax summary reports to show amounts relating to a tax return category entity and details of what this
  * amount is comprised of. Example here shows an amount of $951.96 and also details of what this amount is comprised of:
  */
-export declare class TaxReturnCategoryItem {
+export declare class ReportItem {
     amount: number;
-    details: TaxReturnCategoryItemDetails[];
-    items: TaxReturnCategoryItem[];
+    details: ReportItemDetails[];
+    items: ReportItem[];
     taxReturnCategory: TaxReturnCategory;
     taxWithheld: number;
     /**

package/lib/models/tax-summary/tax-summary-section.d.ts

@@ -1,5 +1,5 @@
 import { TaxSummarySectionEnum } from '../../db/Enums/tax-summary-section.enum';
-import { TaxReturnCategoryItemCollection } from '../../collections/tax-return-category-item.collection';
+import { ReportItemCollection } from '../../collections/tax-summary/report-item.collection';
 /**
  * Base class for each sections of Tax Summary report, contains common properties/methods
  * See also TaxSummary model
@@ -7,6 +7,6 @@ import { TaxReturnCategoryItemCollection } from '../../collections/tax-return-ca
 export declare class TaxSummarySection {
     section: TaxSummarySectionEnum;
     netAmount: number;
-    items: TaxReturnCategoryItemCollection;
+    items: ReportItemCollection;
     id?: string;
 }

package/lib/services/{address → http/address}/address.service.d.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable, ReplaySubject } from 'rxjs';
-import { Country } from '../../models/address/country';
+import { Country } from '../../../models/address/country';
 import * as i0 from "@angular/core";
 export declare class AddressService {
     private http;

package/lib/services/{bank → http/bank/bank-account}/bank-account.service.d.ts

@@ -1,14 +1,14 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { BankAccount as BankAccountBase } from '../../db/Models/bank-account';
-import { BaseRestService } from '../base-rest.service';
-import { BankAccount } from '../../models/bank/bank-account';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { BankAccount as BankAccountBase } from '../../../../db/Models/bank-account';
+import { RestService } from '../../rest/rest.service';
+import { BankAccount } from '../../../../models/bank/bank-account';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service that handling user's bank accounts logic
  */
-export declare class BankAccountService extends BaseRestService<BankAccountBase, BankAccount> {
+export declare class BankAccountService extends RestService<BankAccountBase, BankAccount> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{bank → http/bank/bank-connection}/bank-connection.service.d.ts

@@ -1,15 +1,15 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { BankConnection as BankConnectionBase } from '../../db/Models/bank-connection';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
-import { BankConnection } from '../../models/bank/bank-connection';
-import { BaseRestService } from '../base-rest.service';
+import { BankConnection as BankConnectionBase } from '../../../../db/Models/bank-connection';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
+import { BankConnection } from '../../../../models/bank/bank-connection';
+import { RestService } from '../../rest/rest.service';
 import * as i0 from "@angular/core";
 /**
  * BankConnection means user account at specific bank (usually each user has only one at the same bank)
  * service handles BankConnection management
  */
-export declare class BankConnectionService extends BaseRestService<BankConnectionBase, BankConnection> {
+export declare class BankConnectionService extends RestService<BankConnectionBase, BankConnection> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{bank → http/bank/bank-transaction}/bank-transaction.service.d.ts

@@ -1,14 +1,14 @@
-import { BankTransaction as BankTransactionBase } from '../../db/Models/bank-transaction';
+import { BankTransaction as BankTransactionBase } from '../../../../db/Models/bank-transaction';
 import { Observable } from 'rxjs';
-import { BaseRestService } from '../base-rest.service';
+import { RestService } from '../../rest/rest.service';
 import { HttpClient } from '@angular/common/http';
-import { BankTransaction } from '../../models/bank/bank-transaction';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { BankTransaction } from '../../../../models/bank/bank-transaction';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service for bank transactions business logic
  */
-export declare class BankTransactionService extends BaseRestService<BankTransactionBase, BankTransaction> {
+export declare class BankTransactionService extends RestService<BankTransactionBase, BankTransaction> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{bank → http/bank}/bank.service.d.ts

@@ -1,11 +1,11 @@
-import { Bank as BankBase } from '../../db/Models/bank';
-import { Bank } from '../../models/bank/bank';
-import { BaseRestService } from '../base-rest.service';
+import { Bank as BankBase } from '../../../db/Models/bank';
+import { Bank } from '../../../models/bank/bank';
+import { RestService } from '../rest/rest.service';
 import * as i0 from "@angular/core";
 /**
  * Service that handling banks logic
  */
-export declare class BankService extends BaseRestService<BankBase, Bank> {
+export declare class BankService extends RestService<BankBase, Bank> {
     modelClass: typeof Bank;
     url: string;
     isHydra: boolean;

package/lib/services/{bank → http/bank/basiq}/basiq.service.d.ts

@@ -1,17 +1,17 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable, ReplaySubject } from 'rxjs';
-import { BankAccount as BankAccountBase } from '../../db/Models/bank-account';
-import { BaseRestService } from '../base-rest.service';
-import { BankAccount } from '../../models/bank/bank-account';
-import { BasiqToken } from '../../models/bank/basiq-token';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
-import { BankConnection } from '../../models/bank/bank-connection';
+import { BankAccount as BankAccountBase } from '../../../../db/Models/bank-account';
+import { RestService } from '../../rest/rest.service';
+import { BankAccount } from '../../../../models/bank/bank-account';
+import { BasiqToken } from '../../../../models/bank/basiq-token';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
+import { BankConnection } from '../../../../models/bank/bank-connection';
 import * as i0 from "@angular/core";
 /**
  * basiq is a middleman between bank and user
  * service is responsible for fetching bank related information
  */
-export declare class BasiqService extends BaseRestService<BankAccountBase, BankAccount> {
+export declare class BasiqService extends RestService<BankAccountBase, BankAccount> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{chart-accounts → http/chart-accounts/chart-accounts-depreciations}/chart-accounts-depreciations.service.d.ts

@@ -1,12 +1,12 @@
-import { BaseRestService } from '../base-rest.service';
-import { ChartAccountsDepreciation as ChartAccountsDepreciationBase } from '../../db/Models/chart-accounts-depreciation';
+import { RestService } from '../../rest/rest.service';
+import { ChartAccountsDepreciation as ChartAccountsDepreciationBase } from '../../../../db/Models/chart-accounts-depreciation';
 import { Observable } from 'rxjs';
-import { ChartAccountsDepreciation } from '../../models/chart-accounts/chart-accounts-depreciation';
+import { ChartAccountsDepreciation } from '../../../../models/chart-accounts/chart-accounts-depreciation';
 import * as i0 from "@angular/core";
 /**
  * Service to work with depreciation chart accounts
  */
-export declare class ChartAccountsDepreciationService extends BaseRestService<ChartAccountsDepreciationBase, ChartAccountsDepreciation> {
+export declare class ChartAccountsDepreciationService extends RestService<ChartAccountsDepreciationBase, ChartAccountsDepreciation> {
     url: string;
     modelClass: typeof ChartAccountsDepreciation;
     isHydra: boolean;

package/lib/services/{chart-accounts → http/chart-accounts}/chart-accounts.service.d.ts

@@ -1,8 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable, ReplaySubject } from 'rxjs';
-import { ChartAccountsCategoryEnum } from '../../db/Enums/chart-accounts-category.enum';
-import { ChartAccounts } from '../../models/chart-accounts/chart-accounts';
-import { ChartAccountsHeading } from '../../models/chart-accounts/chart-accounts-heading';
+import { ChartAccountsCategoryEnum } from '../../../db/Enums/chart-accounts-category.enum';
+import { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';
+import { ChartAccountsHeading } from '../../../models/chart-accounts/chart-accounts-heading';
 import * as i0 from "@angular/core";
 /**
  * Chart accounts service

package/lib/services/{chat → http/chat}/chat.service.d.ts

@@ -1,15 +1,15 @@
-import { Chat as ChatBase } from '../../db/Models/chat';
+import { Chat as ChatBase } from '../../../db/Models/chat';
 import { HttpClient } from '@angular/common/http';
-import { SseService } from '../event/sse.service';
-import { BaseRestService } from '../base-rest.service';
-import { IEventListener } from '../../interfaces/event-listener.interface';
-import { Chat } from '../../models/chat/chat';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { SseService } from '../../event/sse.service';
+import { RestService } from '../rest/rest.service';
+import { IEventListener } from '../../../interfaces/event-listener.interface';
+import { Chat } from '../../../models/chat/chat';
+import { EventDispatcherService } from '../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service for work with chats
  */
-export declare class ChatService extends BaseRestService<ChatBase, Chat> implements IEventListener {
+export declare class ChatService extends RestService<ChatBase, Chat> implements IEventListener {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{chat → http/chat/message}/message.service.d.ts

@@ -1,15 +1,15 @@
-import { Message as MessageBase } from '../../db/Models/message';
-import { IEventListener } from '../../interfaces/event-listener.interface';
+import { Message as MessageBase } from '../../../../db/Models/message';
+import { IEventListener } from '../../../../interfaces/event-listener.interface';
 import { HttpClient } from '@angular/common/http';
-import { Message } from '../../models/chat/message';
-import { BaseRestService } from '../base-rest.service';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
-import { SseService } from '../event/sse.service';
+import { Message } from '../../../../models/chat/message';
+import { RestService } from '../../rest/rest.service';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
+import { SseService } from '../../../event/sse.service';
 import * as i0 from "@angular/core";
 /**
  * Service for work with messages
  */
-export declare class MessageService extends BaseRestService<MessageBase, Message> implements IEventListener {
+export declare class MessageService extends RestService<MessageBase, Message> implements IEventListener {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{chat → http/chat/message-document}/message-document.service.d.ts

@@ -1,8 +1,8 @@
 import { Observable, ReplaySubject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
-import { IEventListener } from '../../interfaces/event-listener.interface';
-import { MessageDocument } from '../../models/chat/message-document';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { IEventListener } from '../../../../interfaces/event-listener.interface';
+import { MessageDocument } from '../../../../models/chat/message-document';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service for work with Message Documents

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

@@ -1,11 +1,11 @@
 import { Observable, ReplaySubject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
-import { DepreciationCapitalProject } from '../../models/depreciation/depreciation-capital-project';
+import { DepreciationCapitalProject } from '../../../../models/depreciation/depreciation-capital-project';
 import * as i0 from "@angular/core";
 /**
  * Service for work with DepreciationCapitalProjects
  */
-export declare class CapitalProjectService {
+export declare class DepreciationCapitalProjectService {
     private http;
     private environment;
     cache: DepreciationCapitalProject[];
@@ -15,6 +15,6 @@ export declare class CapitalProjectService {
     add(capitalProject: DepreciationCapitalProject, propertyId: number): Observable<void>;
     update(capitalProject: DepreciationCapitalProject, propertyId: number): Observable<void>;
     delete(capitalProject: DepreciationCapitalProject, propertyId: number): Observable<void>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<CapitalProjectService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<CapitalProjectService>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<DepreciationCapitalProjectService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<DepreciationCapitalProjectService>;
 }

package/lib/services/{depreciation → http/depreciation}/depreciation.service.d.ts

@@ -1,11 +1,11 @@
 import { Observable } from 'rxjs';
-import { Depreciation as DepreciationBase } from '../../db/Models/depreciation';
+import { Depreciation as DepreciationBase } from '../../../db/Models/depreciation';
 import { HttpClient } from '@angular/common/http';
-import { BaseRestService } from '../base-rest.service';
-import { Depreciation } from '../../models/depreciation/depreciation';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { RestService } from '../rest/rest.service';
+import { Depreciation } from '../../../models/depreciation/depreciation';
+import { EventDispatcherService } from '../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
-export declare class DepreciationService extends BaseRestService<DepreciationBase, Depreciation> {
+export declare class DepreciationService extends RestService<DepreciationBase, Depreciation> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{document → http/document/document-folder}/document-folder.service.d.ts

@@ -1,15 +1,15 @@
-import { DocumentFolder as DocumentFolderBase } from '../../db/Models/document-folder';
+import { DocumentFolder as DocumentFolderBase } from '../../../../db/Models/document-folder';
 import { HttpClient } from '@angular/common/http';
-import { Document } from '../../models/document/document';
+import { Document } from '../../../../models/document/document';
 import { Observable } from 'rxjs';
-import { BaseRestService } from '../base-rest.service';
-import { DocumentFolder } from '../../models/document/document-folder';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { RestService } from '../../rest/rest.service';
+import { DocumentFolder } from '../../../../models/document/document-folder';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service to handle document-folders and depending documents logic
  */
-export declare class DocumentFolderService extends BaseRestService<DocumentFolderBase, DocumentFolder> {
+export declare class DocumentFolderService extends RestService<DocumentFolderBase, DocumentFolder> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{client → http/firm/client-invite}/client-invite.service.d.ts

@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
-import { ClientInvite as ClientInviteBase } from '../../db/Models/client-invite';
-import { BaseRestService } from '../base-rest.service';
-import { ClientInvite } from '../../models/client/client-invite';
+import { ClientInvite as ClientInviteBase } from '../../../../db/Models/client-invite';
+import { RestService } from '../../rest/rest.service';
+import { ClientInvite } from '../../../../models/client/client-invite';
 import * as i0 from "@angular/core";
-export declare class ClientInviteService extends BaseRestService<ClientInviteBase, ClientInvite> {
+export declare class ClientInviteService extends RestService<ClientInviteBase, ClientInvite> {
     url: string;
     modelClass: typeof ClientInvite;
     /**

package/lib/services/{client → http/firm/client-movement}/client-movement.service.d.ts

@@ -1,13 +1,13 @@
-import { ClientMovement as ClientMovementBase } from '../../db/Models/client-movement';
+import { ClientMovement as ClientMovementBase } from '../../../../db/Models/client-movement';
 import { Observable } from 'rxjs';
-import { ClientMovementCollection } from '../../collections/client-movement.collection';
-import { FirmTypeEnum } from '../../db/Enums/firm-type.enum';
+import { ClientMovementCollection } from '../../../../collections/client-movement.collection';
+import { FirmTypeEnum } from '../../../../db/Enums/firm-type.enum';
 import { HttpClient } from '@angular/common/http';
-import { BaseRestService } from '../base-rest.service';
-import { ClientMovement } from '../../models/client/client-movement';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { RestService } from '../../rest/rest.service';
+import { ClientMovement } from '../../../../models/client/client-movement';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
-export declare class ClientMovementService extends BaseRestService<ClientMovementBase, ClientMovement> {
+export declare class ClientMovementService extends RestService<ClientMovementBase, ClientMovement> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{employee → http/firm/employee}/employee.service.d.ts

@@ -1,9 +1,9 @@
-import { BaseRestService } from '../base-rest.service';
-import { User as UserBase } from '../../db/Models/user';
+import { RestService } from '../../rest/rest.service';
+import { User as UserBase } from '../../../../db/Models/user';
 import { Observable } from 'rxjs';
-import { User } from '../../models/user/user';
+import { User } from '../../../../models/user/user';
 import * as i0 from "@angular/core";
-export declare class EmployeeService extends BaseRestService<UserBase, User> {
+export declare class EmployeeService extends RestService<UserBase, User> {
     url: string;
     modelClass: typeof User;
     /**

package/lib/services/{employee → http/firm/employee-invite}/employee-invite.service.d.ts

@@ -1,9 +1,9 @@
-import { EmployeeInvite as EmployeeInviteBase } from '../../db/Models/employee-invite';
+import { EmployeeInvite as EmployeeInviteBase } from '../../../../db/Models/employee-invite';
 import { Observable } from 'rxjs';
-import { EmployeeInvite } from '../../models/employee/employee-invite';
-import { BaseRestService } from '../base-rest.service';
+import { EmployeeInvite } from '../../../../models/employee/employee-invite';
+import { RestService } from '../../rest/rest.service';
 import * as i0 from "@angular/core";
-export declare class EmployeeInviteService extends BaseRestService<EmployeeInviteBase, EmployeeInvite> {
+export declare class EmployeeInviteService extends RestService<EmployeeInviteBase, EmployeeInvite> {
     url: string;
     modelClass: typeof EmployeeInvite;
     /**

package/lib/services/{firm → http/firm}/firm.service.d.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable, ReplaySubject } from 'rxjs';
-import { FirmTypeEnum } from '../../db/Enums/firm-type.enum';
-import { Firm } from '../../models/firm/firm';
+import { FirmTypeEnum } from '../../../db/Enums/firm-type.enum';
+import { Firm } from '../../../models/firm/firm';
 import * as i0 from "@angular/core";
 export declare class FirmService {
     private http;

package/lib/services/{client → http/firm/portfolio-report}/client-portfolio-report.service.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
-import { ClientPortfolioReportCollection } from '../../collections/client-portfolio-report.collection';
+import { ClientPortfolioReportCollection } from '../../../../collections/client-portfolio-report.collection';
 import * as i0 from "@angular/core";
 /**
  * Service to work with employee clients tax summary data

package/lib/services/{income-source → http/income-source/income-source-forecast}/income-source-forecast.service.d.ts

@@ -1,13 +1,13 @@
 import { HttpClient } from '@angular/common/http';
-import { IncomeSourceForecast as IncomeSourceForecastBase } from '../../db/Models/income-source-forecast';
-import { BaseRestService } from '../base-rest.service';
-import { IncomeSourceForecast } from '../../models/income-source/income-source-forecast';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { IncomeSourceForecast as IncomeSourceForecastBase } from '../../../../db/Models/income-source-forecast';
+import { RestService } from '../../rest/rest.service';
+import { IncomeSourceForecast } from '../../../../models/income-source/income-source-forecast';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service to work with Other Income Forecasts
  */
-export declare class IncomeSourceForecastService extends BaseRestService<IncomeSourceForecastBase, IncomeSourceForecast> {
+export declare class IncomeSourceForecastService extends RestService<IncomeSourceForecastBase, IncomeSourceForecast> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{income-source → http/income-source}/income-source.service.d.ts

@@ -1,17 +1,17 @@
 import { Observable, ReplaySubject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
-import { IncomeSource as IncomeSourceBase } from '../../db/Models/income-source';
-import { BaseRestService } from '../base-rest.service';
-import { IncomeSourceType } from '../../models/income-source/income-source-type';
-import { SalaryForecast } from '../../models/income-source/salary-forecast';
-import { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
-import { IncomeSource } from '../../models/income-source/income-source';
+import { IncomeSource as IncomeSourceBase } from '../../../db/Models/income-source';
+import { RestService } from '../rest/rest.service';
+import { IncomeSourceType } from '../../../models/income-source/income-source-type';
+import { SalaryForecast } from '../../../models/income-source/salary-forecast';
+import { IncomeSourceTypeEnum } from '../../../db/Enums/income-source-type.enum';
+import { EventDispatcherService } from '../../event/event-dispatcher.service';
+import { IncomeSource } from '../../../models/income-source/income-source';
 import * as i0 from "@angular/core";
 /**
  * Service to work with income sources
  */
-export declare class IncomeSourceService extends BaseRestService<IncomeSourceBase, IncomeSource> {
+export declare class IncomeSourceService extends RestService<IncomeSourceBase, IncomeSource> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{income-source → http/income-source/salary-forecast}/salary-forecast.service.d.ts

@@ -1,14 +1,14 @@
-import { SalaryForecast as SalaryForecastBase } from '../../db/Models/salary-forecast';
+import { SalaryForecast as SalaryForecastBase } from '../../../../db/Models/salary-forecast';
 import { HttpClient } from '@angular/common/http';
-import { BaseRestService } from '../base-rest.service';
-import { IEventListener } from '../../interfaces/event-listener.interface';
-import { SalaryForecast } from '../../models/income-source/salary-forecast';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { RestService } from '../../rest/rest.service';
+import { IEventListener } from '../../../../interfaces/event-listener.interface';
+import { SalaryForecast } from '../../../../models/income-source/salary-forecast';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
 /**
  * Service to work with Salary Forecasts
  */
-export declare class SalaryForecastService extends BaseRestService<SalaryForecastBase, SalaryForecast> implements IEventListener {
+export declare class SalaryForecastService extends RestService<SalaryForecastBase, SalaryForecast> implements IEventListener {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{income-source → http/income-source/sole-forecast}/sole-forecast.service.d.ts

@@ -1,10 +1,10 @@
 import { HttpClient } from '@angular/common/http';
-import { SoleForecast as SoleForecastBase } from '../../db/Models/sole-forecast';
-import { BaseRestService } from '../base-rest.service';
-import { SoleForecast } from '../../models/income-source/sole-forecast';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
+import { SoleForecast as SoleForecastBase } from '../../../../db/Models/sole-forecast';
+import { RestService } from '../../rest/rest.service';
+import { SoleForecast } from '../../../../models/income-source/sole-forecast';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
 import * as i0 from "@angular/core";
-export declare class SoleForecastService extends BaseRestService<SoleForecastBase, SoleForecast> {
+export declare class SoleForecastService extends RestService<SoleForecastBase, SoleForecast> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{borrowing-expense → http/loan/borrowing-expense}/borrowing-expense.service.d.ts

@@ -1,7 +1,7 @@
 import { Observable, ReplaySubject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
-import { BorrowingExpense } from '../../models/borrowing-expense/borrowing-expense';
-import { Loan } from '../../models/loan/loan';
+import { BorrowingExpense } from '../../../../models/borrowing-expense/borrowing-expense';
+import { Loan } from '../../../../models/loan/loan';
 import * as i0 from "@angular/core";
 export declare class BorrowingExpenseService {
     private http;

package/lib/services/{loan → http/loan}/loan.service.d.ts

@@ -1,15 +1,15 @@
 import { Observable } from 'rxjs';
-import { Loan as LoanBase } from '../../db/Models/loan';
+import { Loan as LoanBase } from '../../../db/Models/loan';
 import { HttpClient } from '@angular/common/http';
-import { BaseRestService } from '../base-rest.service';
-import { Loan } from '../../models/loan/loan';
-import { EventDispatcherService } from '../event/event-dispatcher.service';
-import { LoanPayout } from '../../models/loan/loan-payout';
+import { RestService } from '../rest/rest.service';
+import { Loan } from '../../../models/loan/loan';
+import { EventDispatcherService } from '../../event/event-dispatcher.service';
+import { LoanPayout } from '../../../models/loan/loan-payout';
 import * as i0 from "@angular/core";
 /**
  * Service that handling loans logic
  */
-export declare class LoanService extends BaseRestService<LoanBase, Loan> {
+export declare class LoanService extends RestService<LoanBase, Loan> {
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;
     protected environment: any;

package/lib/services/{property → http/property}/property-category/property-category.service.d.ts

@@ -1,11 +1,11 @@
-import { PropertyCategory as PropertyCategoryBase } from '../../../db/Models/property/property-category';
-import { BaseRestService } from '../../base-rest.service';
-import { PropertyCategory } from '../../../models/property/property-category';
+import { PropertyCategory as PropertyCategoryBase } from '../../../../db/Models/property/property-category';
+import { RestService } from '../../rest/rest.service';
+import { PropertyCategory } from '../../../../models/property/property-category';
 import * as i0 from "@angular/core";
 /**
  * Service for work with Property Categories
  */
-export declare class PropertyCategoryService extends BaseRestService<PropertyCategoryBase, PropertyCategory> {
+export declare class PropertyCategoryService extends RestService<PropertyCategoryBase, PropertyCategory> {
     modelClass: typeof PropertyCategory;
     url: string;
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertyCategoryService, never>;