law-common 10.18.2-beta.6 → 10.19.1-beta.1

package/dist/src/api/index.d.ts

@@ -83,3 +83,4 @@ export * from "./interface/to-do.entity.api";
 export * from "./interface/billing-reimbursement-expense.api";
 export * from "./interface/billing-reimbursement-expense-history.api";
 export * from "./interface/project-user-mapping.entity.api";
+export * from "./interface/billing-transaction-history.api";

package/dist/src/api/index.js

@@ -99,3 +99,4 @@ __exportStar(require("./interface/to-do.entity.api"), exports);
 __exportStar(require("./interface/billing-reimbursement-expense.api"), exports);
 __exportStar(require("./interface/billing-reimbursement-expense-history.api"), exports);
 __exportStar(require("./interface/project-user-mapping.entity.api"), exports);
+__exportStar(require("./interface/billing-transaction-history.api"), exports);

package/dist/src/api/interface/billing-transaction-history.api.d.ts

@@ -0,0 +1,3 @@
+import { IApiEntity, IBillingTransactionHistoryEntity } from "../../entities";
+export type IBillingTransactionHistoryApiEntity = IApiEntity<IBillingTransactionHistoryEntity>;
+export type IBillingTransactionHistoryApiEntityArray = IBillingTransactionHistoryApiEntity[];

package/dist/src/api/interface/billing-transaction-history.api.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/api/interface/billing.create.dto.interface.d.ts

@@ -16,7 +16,7 @@ export interface IBillingCreateDtoExtra {
 }
 export interface IBillingTimesheetUnchangedDto {
     id: number;
-    amount: number;
+    amount?: number;
 }
 export interface IBillingTimesheetUpdateDeleteDetailDto {
     id: number;
@@ -24,7 +24,7 @@ export interface IBillingTimesheetUpdateDeleteDetailDto {
     description: string;
     date: string;
     duration: number;
-    amount: number;
+    amount?: number;
     impact: BillingImpactEnum;
     amendmentPurpose: string;
 }

package/dist/src/api/interface/billing.transaction.create.dto.interface.d.ts

@@ -1,3 +1,5 @@
-import { IBillingTransactionEntity, IEntityCreateDto } from "../../entities";
-export interface IBillingTransactionCreateDto extends IEntityCreateDto<IBillingTransactionEntity> {
+import { BillingTransactionStatusEnum, IBillingTransactionEntity, IEntityCreateDto } from "../../entities";
+export type IBillingTransactionExclude = "status";
+export interface IBillingTransactionCreateDto extends Omit<IEntityCreateDto<IBillingTransactionEntity>, IBillingTransactionExclude> {
+    status?: BillingTransactionStatusEnum;
 }

package/dist/src/api/interface/billing.transaction.entity.response.d.ts

@@ -1,4 +1,4 @@
-import { IApiEntity, IBillingTransactionEntity } from "../../entities";
+import { BillingTransactionActionEnum, BillingTransactionStatusEnum, IApiEntity, IBillingTransactionEntity } from "../../entities";
 import { IBillingApiEntity } from "./billing.entity.api";
 export type IBillingTransactionApiEntity = IApiEntity<IBillingTransactionEntity>;
 export type IBillingTransactionApiEntityArray = IBillingTransactionApiEntity[];
@@ -6,3 +6,13 @@ export type IBillingTransactionEntityGet = {
     billingTransaction: IBillingTransactionApiEntity;
     billing: IBillingApiEntity;
 };
+export type IBillingTransactionFlowConfig = {
+    [key in BillingTransactionStatusEnum]?: {
+        actions: {
+            [key in BillingTransactionActionEnum]?: {
+                permissions: string[];
+                next: () => BillingTransactionStatusEnum;
+            };
+        };
+    };
+};

package/dist/src/api/interface/billing.transaction.update.dto.interface.d.ts

@@ -1,3 +1,7 @@
-import { IBillingTransactionEntity, IEntityUpdateDto } from "../../entities";
+import { BillingTransactionActionEnum, IBillingTransactionEntity, IEntityUpdateDto } from "../../entities";
+export interface IBillingTransactionActionDataDto {
+    action: BillingTransactionActionEnum;
+}
 export interface IBillingTransactionUpdateDto extends IEntityUpdateDto<IBillingTransactionEntity> {
+    actionData?: IBillingTransactionActionDataDto;
 }

package/dist/src/api/interface/billing.update.dto.interface.d.ts

@@ -1,10 +1,12 @@
-import { BillingActionsEnum, IBillingEntity, IBillingTimesheetUpdateDto, IEntityUpdateDto } from "../../entities";
-import { IBillingEntityCreateDtoValidationData } from "./billing.create.dto.interface";
+import { BillingActionsEnum, IBillingEntity, IBillingReimbursementExpenseUpdateDto, IBillingTimesheetUpdateDto, IEntityUpdateDto } from "../../entities";
+import { IBillingEntityCreateDtoValidationData, IBillingParticulars } from "./billing.create.dto.interface";
 export interface IBillingUpdateDto extends IEntityUpdateDto<IBillingEntity> {
 }
-export interface IUpdateBillingDto extends IBillingUpdateDto {
+export interface IUpdateBillingDto extends Omit<IBillingUpdateDto, "particulars"> {
     action?: BillingActionsEnum;
     timesheets?: IBillingTimesheetUpdateDto[];
+    reimbursementExpenses?: IBillingReimbursementExpenseUpdateDto[];
+    particulars?: IBillingParticulars;
 }
 export interface IBillingUpdateDtoValidationData extends IBillingEntityCreateDtoValidationData {
     billingEntity: IBillingEntity;

package/dist/src/constants/entity_constants.d.ts

@@ -12,3 +12,4 @@ export declare const systemUsers: string[];
 export declare const reimbursementExpenseProjectUserInactiveBuffer: number;
 export declare const annualPaidLeaves = 24;
 export declare const designationPriorityOrder: Record<string, number>;
+export declare const allowedProjectUpdateBillingStatuses: BillingStatusEnum[];

package/dist/src/constants/entity_constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.designationPriorityOrder = exports.annualPaidLeaves = exports.reimbursementExpenseProjectUserInactiveBuffer = exports.systemUsers = exports.usersToExcludeFromSearchResponse = exports.freezeTimesheetAfterBillingStatus = exports.leaveImplicitDays = exports.reimbursementPaymentProcessorPermissionName = exports.toDoListMinimumEstimatedDuration = exports.timesheetMinimumTotalDuration = exports.timesheetEnterThreshold = exports.timesheetThreshold = exports.timesheetViewThreshold = void 0;
+exports.allowedProjectUpdateBillingStatuses = exports.designationPriorityOrder = exports.annualPaidLeaves = exports.reimbursementExpenseProjectUserInactiveBuffer = exports.systemUsers = exports.usersToExcludeFromSearchResponse = exports.freezeTimesheetAfterBillingStatus = exports.leaveImplicitDays = exports.reimbursementPaymentProcessorPermissionName = exports.toDoListMinimumEstimatedDuration = exports.timesheetMinimumTotalDuration = exports.timesheetEnterThreshold = exports.timesheetThreshold = exports.timesheetViewThreshold = void 0;
 const entities_1 = require("../entities");
 exports.timesheetViewThreshold = "timesheetViewThreshold";
 exports.timesheetThreshold = "timesheetThreshold";
@@ -20,3 +20,7 @@ exports.designationPriorityOrder = {
     seniorAssociate: 3,
     associate: 4,
 };
+exports.allowedProjectUpdateBillingStatuses = [
+    entities_1.BillingStatusEnum.SETTLED,
+    entities_1.BillingStatusEnum.CANCELLED,
+];

package/dist/src/entities/enums/billing-transaction-action.enum.d.ts

@@ -0,0 +1,11 @@
+export declare enum BillingTransactionActionEnum {
+    UPDATE_PAYMENT = "updatePayment",
+    WRITE_OFF = "writeOff",
+    CREDIT_NOTE = "creditNote",
+    TDS = "tds",
+    WRITE_OFF_APPROVAL = "writeOffApproval",
+    CREDIT_NOTE_APPROVAL = "creditNoteApproval",
+    APPROVE = "approve",
+    REJECT = "reject",
+    EDIT = "edit"
+}

package/dist/src/entities/enums/billing-transaction-action.enum.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BillingTransactionActionEnum = void 0;
+var BillingTransactionActionEnum;
+(function (BillingTransactionActionEnum) {
+    BillingTransactionActionEnum["UPDATE_PAYMENT"] = "updatePayment";
+    BillingTransactionActionEnum["WRITE_OFF"] = "writeOff";
+    BillingTransactionActionEnum["CREDIT_NOTE"] = "creditNote";
+    BillingTransactionActionEnum["TDS"] = "tds";
+    BillingTransactionActionEnum["WRITE_OFF_APPROVAL"] = "writeOffApproval";
+    BillingTransactionActionEnum["CREDIT_NOTE_APPROVAL"] = "creditNoteApproval";
+    BillingTransactionActionEnum["APPROVE"] = "approve";
+    BillingTransactionActionEnum["REJECT"] = "reject";
+    BillingTransactionActionEnum["EDIT"] = "edit";
+})(BillingTransactionActionEnum || (exports.BillingTransactionActionEnum = BillingTransactionActionEnum = {}));

package/dist/src/entities/enums/billing-transaction-status.enum.d.ts

@@ -0,0 +1,6 @@
+export declare enum BillingTransactionStatusEnum {
+    APPROVED = "approved",
+    REJECTED = "rejected",
+    WRITEOFF_APPROVAL_PENDING = "writeoff_approval_pending",
+    CREDITNOTE_APPROVAL_PENDING = "creditnote_approval_pending"
+}

package/dist/src/entities/enums/billing-transaction-status.enum.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BillingTransactionStatusEnum = void 0;
+var BillingTransactionStatusEnum;
+(function (BillingTransactionStatusEnum) {
+    BillingTransactionStatusEnum["APPROVED"] = "approved";
+    BillingTransactionStatusEnum["REJECTED"] = "rejected";
+    BillingTransactionStatusEnum["WRITEOFF_APPROVAL_PENDING"] = "writeoff_approval_pending";
+    BillingTransactionStatusEnum["CREDITNOTE_APPROVAL_PENDING"] = "creditnote_approval_pending";
+})(BillingTransactionStatusEnum || (exports.BillingTransactionStatusEnum = BillingTransactionStatusEnum = {}));

package/dist/src/entities/index.d.ts

@@ -66,7 +66,6 @@ export * from "./interface/intermediary_bank.entity.interface";
 export * from "./interface/holiday-list.entity.interface";
 export * from "./interface/holiday.entity.interface";
 export * from "./model/leave.entity.model";
-export * from "./model/leave_count.entity.model";
 export * from "./model/holiday.entity.model";
 export * from "./enums/cron-jobs-name.enum";
 export * from "./enums/cron-jobs-status.enum";
@@ -96,3 +95,8 @@ export * from "./model/configuration.model";
 export * from "./model/designation.entity.model";
 export * from "./model/timesheet.entity.model";
 export * from "./model/user.entity.model";
+export * from "./model/client-affiliate.entity.model";
+export * from "./model/billing-timesheet.entity.model";
+export * from "./enums/billing-transaction-action.enum";
+export * from "./enums/billing-transaction-status.enum";
+export * from "./interface/billing-transaction-history.entity";

package/dist/src/entities/index.js

@@ -83,7 +83,6 @@ __exportStar(require("./interface/intermediary_bank.entity.interface"), exports)
 __exportStar(require("./interface/holiday-list.entity.interface"), exports);
 __exportStar(require("./interface/holiday.entity.interface"), exports);
 __exportStar(require("./model/leave.entity.model"), exports);
-__exportStar(require("./model/leave_count.entity.model"), exports);
 __exportStar(require("./model/holiday.entity.model"), exports);
 __exportStar(require("./enums/cron-jobs-name.enum"), exports);
 __exportStar(require("./enums/cron-jobs-status.enum"), exports);
@@ -113,3 +112,8 @@ __exportStar(require("./model/configuration.model"), exports);
 __exportStar(require("./model/designation.entity.model"), exports);
 __exportStar(require("./model/timesheet.entity.model"), exports);
 __exportStar(require("./model/user.entity.model"), exports);
+__exportStar(require("./model/client-affiliate.entity.model"), exports);
+__exportStar(require("./model/billing-timesheet.entity.model"), exports);
+__exportStar(require("./enums/billing-transaction-action.enum"), exports);
+__exportStar(require("./enums/billing-transaction-status.enum"), exports);
+__exportStar(require("./interface/billing-transaction-history.entity"), exports);

package/dist/src/entities/interface/billing-transaction-history.entity.d.ts

@@ -0,0 +1,7 @@
+import { IBaseHistoryEntity, IEntityCreateDto, IEntityFilterData } from "./entity.utils.interface";
+export interface IBillingTransactionHistoryEntity extends IBaseHistoryEntity {
+}
+export interface IBillingTransactionHistoryCreateDto extends IEntityCreateDto<IBillingTransactionHistoryEntity> {
+}
+export interface IBillingTransactionHistorySearchDto extends IEntityFilterData<IBillingTransactionHistoryEntity> {
+}

package/dist/src/entities/interface/billing-transaction-history.entity.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/entities/interface/billing.entity.interface.d.ts

@@ -11,6 +11,7 @@ export interface IBillingEntity extends IAuditColumnEntity {
     endDate: string;
     projectId: number;
     totalAmount: number;
+    inrAmount?: number;
     totalMinutes: number;
     invoiceNumber: string;
     paymentStatus: PaymentStatusEnum;

package/dist/src/entities/interface/billing_timesheet.entity.interface.d.ts

@@ -13,7 +13,7 @@ export interface IBillingTimesheetEntity extends IAuditColumnEntity {
     task: string;
     description?: string;
     totalDuration: number;
-    totalAmount: number;
+    totalAmount?: number;
     impact: BillingImpactEnum;
     amendmentPurpose?: string;
     changedStatus: BillingTimesheetStatusEnum;
@@ -23,7 +23,7 @@ export interface IBillingTimesheetEntityCreateDto extends IEntityCreateDto<IBill
 export interface IBillingTimesheetDetail extends IAuditColumnEntity {
     timesheetId: number;
     billingId: number;
-    totalAmount: number;
+    totalAmount?: number;
     changedStatus: BillingTimesheetStatusEnum;
     impact: BillingImpactEnum;
     amendmentPurpose?: string;

package/dist/src/entities/interface/billing_transaction.entity.interface.d.ts

@@ -1,3 +1,4 @@
+import { BillingTransactionStatusEnum } from "../enums/billing-transaction-status.enum";
 import { BillingTransactionType } from "../enums/billing.transaction.enum";
 import { IAuditColumnEntity } from "./audit-column.entity.interface";
 import { IEntityFilterData } from "./entity.utils.interface";
@@ -7,5 +8,11 @@ export interface IBillingTransactionEntity extends IAuditColumnEntity {
     type: BillingTransactionType;
     amount: number;
     details: string;
+    bankCharges?: number;
+    bankId?: number;
+    paymentDate?: number;
+    referenceNo?: string;
+    supportingDocs?: number;
+    status: BillingTransactionStatusEnum;
 }
 export type IBillingTransactionEntityFilterData = IEntityFilterData<IBillingTransactionEntity>;

package/dist/src/entities/interface/entity.utils.interface.d.ts

@@ -3,21 +3,25 @@ import { ConvertToArray } from "../../misc";
 import { Modify } from "../../misc/interface/modify.interface";
 import { EntitySearchConstraintTypeEnum } from "../enums/entity_search_constraint_type.enum";
 import { HistoryOperationEnum } from "../enums/history_operation.enum";
+import { BankEntityModel } from "../model/bank.entity.model";
 import { BillingReimbursementExpneseEntityModel } from "../model/billing-reimbursement-expense.entity.model";
+import { BillingTimesheetEntityModel } from "../model/billing-timesheet.entity.model";
 import { BillingEntityModel } from "../model/billing.entity.model";
+import { ClientAffiliateEntityModel } from "../model/client-affiliate.entity.model";
 import { ClientEntityModel } from "../model/client.entity.model";
-import { HolidayEntityModel } from "../model/holiday.entity.model";
-import { LeaveEntityModel } from "../model/leave.entity.model";
-import { LeaveCountVirtualEntityModel } from "../model/leave_count.entity.model";
+import { ConfigurationEntityModel } from "../model/configuration.model";
 import { ProjectUserMappingEntityModel } from "../model/project-user-mapping.entity.model";
 import { ProjectEntityModel } from "../model/project.entity.model";
 import { ReimbursementExpenseEntityModel } from "../model/reimbursement-expense.entity.model";
 import { ReimbursementEntityModel } from "../model/reimbursement.entity.model";
+import { TaskEntityModel } from "../model/task.entity.model";
+import { TimesheetEntityModel } from "../model/timesheet.entity.model";
 import { UserEntityModel } from "../model/user.entity.model";
 import { IAuditColumnEntity } from "./audit-column.entity.interface";
 import { IBankEntity } from "./bank.entity.interface";
 import { IBankHistoryEntity } from "./bank_history.entity.interface";
 import { IBillingReimbursementExpenseEntity } from "./billing-reimbursement-expense.entity.interface";
+import { IBillingTransactionHistoryEntity } from "./billing-transaction-history.entity";
 import { IBillingEntity } from "./billing.entity.interface";
 import { IBillingPaymentEntity } from "./billing_payment.entity.interface";
 import { IBillingTimesheetEntity } from "./billing_timesheet.entity.interface";
@@ -118,6 +122,7 @@ export declare enum EntityEnum {
     BANK_HISTORY = "bank_history",
     BILLING_PAYMENT = "billing_payment",
     BILLING_TRANSACTION = "billing_transaction",
+    BILLING_TRANSACTION_HISTORY = "billing_transaction_history",
     CONFIGURATION = "configuration",
     COUNTRY = "country",
     EXPENSE_TYPE = "expense_type",
@@ -155,7 +160,7 @@ export type IBaseEntityApiResponse<T extends {
         [K in EntityEnum | VirtualEntityEnum]?: IBaseEntityApiResponse<EnumEntityType<K>>;
     };
 };
-export type EnumEntityType<T extends EntityEnum | VirtualEntityEnum> = (T extends EntityEnum.BILLING ? IBillingEntity : T extends EntityEnum.BILLING_TIMESHEET ? IBillingTimesheetEntity : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? IBillingReimbursementExpenseEntity : T extends EntityEnum.TIMESHEET ? ITimesheetEntity : T extends EntityEnum.USER ? IUserEntity : T extends EntityEnum.PROJECT ? IProjectEntity : T extends EntityEnum.CLIENT ? IClientEntity : T extends EntityEnum.LEAVE ? ILeaveEntity : T extends EntityEnum.BANK ? IBankEntity : T extends EntityEnum.BILLING_PAYMENT ? IBillingPaymentEntity : T extends EntityEnum.BILLING_TRANSACTION ? IBillingTransactionEntity : T extends EntityEnum.CLIENT_AFFILIATE ? IClientAffiliateEntity : T extends EntityEnum.CONFIGURATION ? IConfigurationEntity : T extends EntityEnum.HOLIDAY ? IHolidayEntity : T extends EntityEnum.HOLIDAY_LIST ? IHolidayListEntity : T extends EntityEnum.COUNTRY ? ICountryEntity : T extends EntityEnum.EXPENSE_TYPE ? IExpenseTypeEntity : T extends EntityEnum.INDUSTRY ? IIndustryEntity : T extends EntityEnum.INTERMEDIARY_BANK ? IIntermediaryBankEntity : T extends EntityEnum.OFFICE_LOCATION ? IOfficeLocationEntity : T extends EntityEnum.PERMISSION ? IPermissionEntity : T extends EntityEnum.ROLE ? IRoleEntity : T extends EntityEnum.TASK ? ITaskEntity : T extends EntityEnum.DESIGNATION ? IDesignationEntity : T extends EntityEnum.RATE ? IRateEntity : T extends EntityEnum.REIMBURSEMENT ? IReimbursementEntity : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? IReimbursementExpenseEntity : T extends EntityEnum.WORK_FROM_HOME ? IWorkFromHomeEntity : T extends EntityEnum.ORGANIZATION ? IOrganizationEntity : T extends EntityEnum.PROJECT_USER_MAPPING ? IProjectUserMappingEntity : T extends EntityEnum.CLIENT_USER_MAPPING ? IClientUserMappingEntity : T extends EntityEnum.TO_DO_LIST ? IToDoListEntity : T extends EntityEnum.CRON_JOBS ? ICronJobsEntity : T extends EntityEnum.ROLE_PERMISSION_MAPPING ? IRolePermissionMappingEntity : T extends VirtualEntityEnum.USER_LEAVE ? IUserLeaveVirtualEntity : T extends VirtualEntityEnum.LEAVE_COUNT ? ILeaveCountVirtualEntity : T extends EntityEnum.BANK_HISTORY ? IBankHistoryEntity : T extends EntityEnum.LEAVE_HISTORY ? ILeaveHistoryEntity : T extends EntityEnum.WORK_FROM_HOME_HISTORY ? IWorkFromHomeHistoryEntity : T extends EntityEnum.TIMESHEET_HISTORY ? ITimesheetHistoryEntity : never) & {
+export type EnumEntityType<T extends EntityEnum | VirtualEntityEnum> = (T extends EntityEnum.BILLING ? IBillingEntity : T extends EntityEnum.BILLING_TIMESHEET ? IBillingTimesheetEntity : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? IBillingReimbursementExpenseEntity : T extends EntityEnum.TIMESHEET ? ITimesheetEntity : T extends EntityEnum.USER ? IUserEntity : T extends EntityEnum.PROJECT ? IProjectEntity : T extends EntityEnum.CLIENT ? IClientEntity : T extends EntityEnum.LEAVE ? ILeaveEntity : T extends EntityEnum.BANK ? IBankEntity : T extends EntityEnum.BILLING_PAYMENT ? IBillingPaymentEntity : T extends EntityEnum.BILLING_TRANSACTION ? IBillingTransactionEntity : T extends EntityEnum.BILLING_TRANSACTION_HISTORY ? IBillingTransactionHistoryEntity : T extends EntityEnum.CLIENT_AFFILIATE ? IClientAffiliateEntity : T extends EntityEnum.CONFIGURATION ? IConfigurationEntity : T extends EntityEnum.HOLIDAY ? IHolidayEntity : T extends EntityEnum.HOLIDAY_LIST ? IHolidayListEntity : T extends EntityEnum.COUNTRY ? ICountryEntity : T extends EntityEnum.EXPENSE_TYPE ? IExpenseTypeEntity : T extends EntityEnum.INDUSTRY ? IIndustryEntity : T extends EntityEnum.INTERMEDIARY_BANK ? IIntermediaryBankEntity : T extends EntityEnum.OFFICE_LOCATION ? IOfficeLocationEntity : T extends EntityEnum.PERMISSION ? IPermissionEntity : T extends EntityEnum.ROLE ? IRoleEntity : T extends EntityEnum.TASK ? ITaskEntity : T extends EntityEnum.DESIGNATION ? IDesignationEntity : T extends EntityEnum.RATE ? IRateEntity : T extends EntityEnum.REIMBURSEMENT ? IReimbursementEntity : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? IReimbursementExpenseEntity : T extends EntityEnum.WORK_FROM_HOME ? IWorkFromHomeEntity : T extends EntityEnum.ORGANIZATION ? IOrganizationEntity : T extends EntityEnum.PROJECT_USER_MAPPING ? IProjectUserMappingEntity : T extends EntityEnum.CLIENT_USER_MAPPING ? IClientUserMappingEntity : T extends EntityEnum.TO_DO_LIST ? IToDoListEntity : T extends EntityEnum.CRON_JOBS ? ICronJobsEntity : T extends EntityEnum.ROLE_PERMISSION_MAPPING ? IRolePermissionMappingEntity : T extends VirtualEntityEnum.USER_LEAVE ? IUserLeaveVirtualEntity : T extends VirtualEntityEnum.LEAVE_COUNT ? ILeaveCountVirtualEntity : T extends EntityEnum.BANK_HISTORY ? IBankHistoryEntity : T extends EntityEnum.LEAVE_HISTORY ? ILeaveHistoryEntity : T extends EntityEnum.WORK_FROM_HOME_HISTORY ? IWorkFromHomeHistoryEntity : T extends EntityEnum.TIMESHEET_HISTORY ? ITimesheetHistoryEntity : never) & {
     id: number;
 };
 export type EntityRelationConfig<T extends EntityEnum | VirtualEntityEnum> = {
@@ -278,12 +283,12 @@ export declare enum VirtualEntityEnum {
 }
 export type IHistoryConstraintSearchResponse<T> = IBaseResponse<IHistoryEntitySearchByConstraintResponse<T>[]>;
 export type IHistoryConstraintSearchServiceResponse<T> = IHistoryEntitySearchByConstraintResponse<T>[];
-export type EnumToModel<T extends EntityEnum | VirtualEntityEnum> = T extends EntityEnum.BILLING ? BillingEntityModel : T extends EntityEnum.CLIENT ? ClientEntityModel : T extends EntityEnum.PROJECT ? ProjectEntityModel : T extends EntityEnum.PROJECT_USER_MAPPING ? ProjectUserMappingEntityModel : T extends EntityEnum.REIMBURSEMENT ? ReimbursementEntityModel : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? ReimbursementExpenseEntityModel : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? BillingReimbursementExpneseEntityModel : T extends EntityEnum.LEAVE ? LeaveEntityModel : T extends EntityEnum.HOLIDAY ? HolidayEntityModel : T extends VirtualEntityEnum.LEAVE_COUNT ? LeaveCountVirtualEntityModel : UserEntityModel;
+export type EnumToModel<T extends EntityEnum | VirtualEntityEnum> = T extends EntityEnum.BILLING ? BillingEntityModel : T extends EntityEnum.CLIENT ? ClientEntityModel : T extends EntityEnum.PROJECT ? ProjectEntityModel : T extends EntityEnum.PROJECT_USER_MAPPING ? ProjectUserMappingEntityModel : T extends EntityEnum.REIMBURSEMENT ? ReimbursementEntityModel : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? ReimbursementExpenseEntityModel : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? BillingReimbursementExpneseEntityModel : T extends EntityEnum.CLIENT_AFFILIATE ? ClientAffiliateEntityModel : T extends EntityEnum.BANK ? BankEntityModel : T extends EntityEnum.CONFIGURATION ? ConfigurationEntityModel : T extends EntityEnum.TASK ? TaskEntityModel : T extends EntityEnum.BILLING_TIMESHEET ? BillingTimesheetEntityModel : T extends EntityEnum.TIMESHEET ? TimesheetEntityModel : UserEntityModel;
 export type EntityMap = {
-    [key in EntityEnum | VirtualEntityEnum]: EnumToModel<key>[];
+    [key in EntityEnum]: EnumToModel<key>[];
 };
 export type EntityIndexMap = {
-    [key in EntityEnum | VirtualEntityEnum]: {
+    [key in EntityEnum]: {
         [id: number]: EnumToModel<key>;
     };
 };

package/dist/src/entities/interface/entity.utils.interface.js

@@ -60,6 +60,7 @@ var EntityEnum;
     EntityEnum["BANK_HISTORY"] = "bank_history";
     EntityEnum["BILLING_PAYMENT"] = "billing_payment";
     EntityEnum["BILLING_TRANSACTION"] = "billing_transaction";
+    EntityEnum["BILLING_TRANSACTION_HISTORY"] = "billing_transaction_history";
     EntityEnum["CONFIGURATION"] = "configuration";
     EntityEnum["COUNTRY"] = "country";
     EntityEnum["EXPENSE_TYPE"] = "expense_type";

package/dist/src/entities/model/bank.entity.model.d.ts

@@ -1,6 +1,8 @@
 import { IBankApiEntity } from "../../api";
 import { BankStatusEnum } from "../enums/bank_status.enum";
-export declare class BankEntityModel implements IBankApiEntity {
+import { EntityEnum } from "../interface/entity.utils.interface";
+import { BaseEntityModel } from "./base.entity.model";
+export declare class BankEntityModel extends BaseEntityModel<EntityEnum.BANK> implements IBankApiEntity {
     id: number;
     accountName: string;
     organizationId: number;
@@ -17,4 +19,5 @@ export declare class BankEntityModel implements IBankApiEntity {
     createdOn: string;
     updatedOn: string;
     static fromApiEntity(apiEntity: IBankApiEntity): BankEntityModel;
+    getRelationConfigs(): any[];
 }

package/dist/src/entities/model/bank.entity.model.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BankEntityModel = void 0;
 const bank_status_enum_1 = require("../enums/bank_status.enum");
-class BankEntityModel {
+const entity_utils_interface_1 = require("../interface/entity.utils.interface");
+const base_entity_model_1 = require("./base.entity.model");
+class BankEntityModel extends base_entity_model_1.BaseEntityModel {
     constructor() {
+        super(...arguments);
         this.id = 0;
         this.accountName = "";
         this.organizationId = 0;
@@ -19,9 +22,12 @@ class BankEntityModel {
         this.updatedOn = "";
     }
     static fromApiEntity(apiEntity) {
-        const entity = new BankEntityModel();
+        const entity = new BankEntityModel(entity_utils_interface_1.EntityEnum.BANK);
         Object.assign(entity, apiEntity);
         return entity;
     }
+    getRelationConfigs() {
+        return this.constructor.prototype.constructor.relationConfigs || [];
+    }
 }
 exports.BankEntityModel = BankEntityModel;

package/dist/src/entities/model/base.entity.model.d.ts

@@ -1,14 +1,8 @@
-import { EntityEnum, EntityIndexMap, VirtualEntityEnum } from "../interface/entity.utils.interface";
-export declare enum RelationType {
-    ONE = "one",
-    MANY = "many"
-}
-export declare abstract class BaseEntityModel<T extends EntityEnum | VirtualEntityEnum> {
+import { EntityEnum, EntityIndexMap } from "../interface/entity.utils.interface";
+export declare abstract class BaseEntityModel<T extends EntityEnum> {
     protected entityName: T;
     constructor(entityName: T);
     abstract getRelationConfigs(): any[];
     populateRelationsByIndex(entityIndexMap: EntityIndexMap): void;
     static populateRelationsForEntities(entityIndexMap: EntityIndexMap, entityType: EntityEnum): void;
-    populateRelations(entityIndexMap: EntityIndexMap): void;
-    overwrite(entityIndexMap: EntityIndexMap, indexKey?: string): this;
 }

package/dist/src/entities/model/base.entity.model.js

@@ -1,56 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntityModel = exports.RelationType = void 0;
-var RelationType;
-(function (RelationType) {
-    RelationType["ONE"] = "one";
-    RelationType["MANY"] = "many";
-})(RelationType || (exports.RelationType = RelationType = {}));
+exports.BaseEntityModel = void 0;
+const relation_type_enum_1 = require("../enums/relation-type.enum");
 class BaseEntityModel {
     constructor(entityName) {
         this.entityName = entityName;
     }
     populateRelationsByIndex(entityIndexMap) {
         for (const relationConfig of this.getRelationConfigs() || []) {
-            const thisMappingKey = relationConfig.mapKeyConfig.key;
-            const relatedMappingKey = relationConfig.mapKeyConfig.relationKey;
-            const thisKey = relationConfig.key;
-            // console.log('Populating relation for', relationConfig.name, 'on', this.entityName, relationConfig);
-            // debugger;
-            if (relationConfig.relation === RelationType.ONE) {
+            if (relationConfig.relation === relation_type_enum_1.RelationType.ONE) {
+                // @ts-ignore
                 const relatedEntities = entityIndexMap[relationConfig.name] || {};
+                // @ts-ignore
                 let foundRelatedEntities = [];
-                if (thisMappingKey.includes(".")) {
-                    const [parentKey, childKey] = thisMappingKey.split(".");
-                    foundRelatedEntities = [relatedEntities[this[parentKey][childKey]]];
+                if (relationConfig.mapKeyConfig.key.includes(".")) {
+                    const [parentKey, childKey] = relationConfig.mapKeyConfig.key.split(".");
+                    // @ts-ignore
+                    if (this[parentKey] && this[parentKey][childKey]) {
+                        // @ts-ignore
+                        foundRelatedEntities = [relatedEntities[this[parentKey][childKey]]];
+                    }
                 }
                 else {
-                    // foundRelatedEntities = relatedEntities[this[thisKey]] ? [relatedEntities[this[thisKey]]] : [];
-                    const relatedEntity = relatedEntities[this[thisMappingKey]];
-                    if (relatedEntity) {
-                        foundRelatedEntities = [relatedEntity];
-                    }
-                    else if (relatedMappingKey !== "id") {
-                        foundRelatedEntities = Object.values(relatedEntities).filter((entity) => entity[relatedMappingKey] === this[thisMappingKey]);
-                    }
-                    else {
-                        foundRelatedEntities = [];
-                    }
+                    foundRelatedEntities = relatedEntities[
+                    // @ts-ignore
+                    this[relationConfig.mapKeyConfig.key]]
+                        ? // @ts-ignore
+                            [relatedEntities[this[relationConfig.mapKeyConfig.key]]]
+                        : [];
                 }
                 if (foundRelatedEntities.length > 1) {
                     throw new Error(`Expected one related entity for ${relationConfig.name} but found ${foundRelatedEntities.length}`);
                 }
                 if (foundRelatedEntities.length === 0) {
-                    console.warn(`No related entity found for ${relationConfig.name} with ${thisMappingKey}=${this[relationConfig.mapKeyConfig.foreignKey]}`);
+                    console.warn(`No related entity found for ${relationConfig.name} with ${relationConfig.mapKeyConfig.key
+                    // @ts-ignore
+                    }=${this[relationConfig.mapKeyConfig.foreignKey]}`);
                 }
-                this[thisKey] = foundRelatedEntities[0];
+                // @ts-ignore
+                this[relationConfig.key] = foundRelatedEntities[0];
             }
-            else if (relationConfig.relation === RelationType.MANY) {
-                this[thisKey] = [];
+            else if (relationConfig.relation === relation_type_enum_1.RelationType.MANY) {
+                // @ts-ignore
+                this[relationConfig.key] = [];
+                // @ts-ignore
                 const relatedEntities = entityIndexMap[relationConfig.name] || {};
                 for (const relatedEntity of Object.values(relatedEntities)) {
-                    if (relatedEntity[relatedMappingKey] === this[thisMappingKey]) {
-                        this[thisKey].push(relatedEntity);
+                    if (
+                    // @ts-ignore
+                    relatedEntity[relationConfig.mapKeyConfig.relationKey] ===
+                        // @ts-ignore
+                        this[relationConfig.mapKeyConfig.key]) {
+                        // @ts-ignore
+                        this[relationConfig.key].push(relatedEntity);
                     }
                 }
             }
@@ -58,20 +60,10 @@ class BaseEntityModel {
     }
     static populateRelationsForEntities(entityIndexMap, entityType) {
         for (const key of Object.keys(entityIndexMap[entityType] || {})) {
+            // @ts-ignore
             const entity = entityIndexMap[entityType][key];
             entity.populateRelationsByIndex(entityIndexMap);
         }
     }
-    populateRelations(entityIndexMap) {
-        this.populateRelationsByIndex(entityIndexMap);
-    }
-    overwrite(entityIndexMap, indexKey = "id") {
-        if (this[indexKey] === undefined) {
-            console.warn(`Entity of type ${this.entityName} does not have ${indexKey}, cannot merge`);
-            return this;
-        }
-        entityIndexMap[this.entityName][this[indexKey]] = this;
-        return this;
-    }
 }
 exports.BaseEntityModel = BaseEntityModel;

package/dist/src/entities/model/billing-timesheet.entity.model.d.ts

@@ -0,0 +1,26 @@
+import { IBillingTimesheetApiEntity } from "../../api";
+import { BillingImpactEnum } from "../enums/billing.impact.enum";
+import { BillingTimesheetStatusEnum } from "../enums/billing.timesheet.change.status.enum";
+import { EntityEnum } from "../interface/entity.utils.interface";
+import { BaseEntityModel } from "./base.entity.model";
+export declare class BillingTimesheetEntityModel extends BaseEntityModel<EntityEnum.BILLING_TIMESHEET> implements IBillingTimesheetApiEntity {
+    id: number;
+    billingId: number;
+    dateCode: string;
+    timesheetId: number;
+    userId: number;
+    projectId: number;
+    task: string;
+    description?: string;
+    totalDuration: number;
+    totalAmount: number;
+    impact: BillingImpactEnum;
+    amendmentPurpose?: string;
+    changedStatus: BillingTimesheetStatusEnum;
+    createdOn: string;
+    updatedOn: string;
+    createdBy: number;
+    updatedBy: number;
+    getRelationConfigs(): any;
+    static fromApiEntity(apiEntity: IBillingTimesheetApiEntity): BillingTimesheetEntityModel;
+}

package/dist/src/entities/model/billing-timesheet.entity.model.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BillingTimesheetEntityModel = void 0;
+const billing_impact_enum_1 = require("../enums/billing.impact.enum");
+const billing_timesheet_change_status_enum_1 = require("../enums/billing.timesheet.change.status.enum");
+const entity_utils_interface_1 = require("../interface/entity.utils.interface");
+const base_entity_model_1 = require("./base.entity.model");
+class BillingTimesheetEntityModel extends base_entity_model_1.BaseEntityModel {
+    constructor() {
+        super(...arguments);
+        this.id = 0;
+        this.billingId = 0;
+        this.dateCode = "";
+        this.timesheetId = 0;
+        this.userId = 0;
+        this.projectId = 0;
+        this.task = "";
+        this.totalDuration = 0;
+        this.totalAmount = 0;
+        this.impact = billing_impact_enum_1.BillingImpactEnum.NEUTRAL; // adjust default if needed
+        this.changedStatus = billing_timesheet_change_status_enum_1.BillingTimesheetStatusEnum.UNCHANGED;
+        this.createdOn = "";
+        this.updatedOn = "";
+        this.createdBy = 0;
+        this.updatedBy = 0;
+    }
+    getRelationConfigs() {
+        return this.constructor.prototype.constructor.relationConfigs;
+    }
+    static fromApiEntity(apiEntity) {
+        const entity = new BillingTimesheetEntityModel(entity_utils_interface_1.EntityEnum.BILLING_TIMESHEET);
+        Object.assign(entity, apiEntity);
+        return entity;
+    }
+}
+exports.BillingTimesheetEntityModel = BillingTimesheetEntityModel;

package/dist/src/entities/model/billing.entity.model.d.ts

@@ -7,8 +7,10 @@ import { BillingInvoiceTypeEnum } from "../enums/billing_invoice_type.enum";
 import { PaymentStatusEnum } from "../enums/payment_status.enum";
 import { EntityEnum, EnumEntityType } from "../interface/entity.utils.interface";
 import { RelationConfigs } from "../interface/relation-config.interface";
+import { BankEntityModel } from "./bank.entity.model";
 import { BaseEntityModel } from "./base.entity.model";
 import { BillingReimbursementExpneseEntityModel } from "./billing-reimbursement-expense.entity.model";
+import { BillingTimesheetEntityModel } from "./billing-timesheet.entity.model";
 import { ClientEntityModel } from "./client.entity.model";
 import { ProjectEntityModel } from "./project.entity.model";
 import { ReimbursementExpenseEntityModel } from "./reimbursement-expense.entity.model";
@@ -55,12 +57,16 @@ export declare class BillingEntityModel extends BaseEntityModel<EntityEnum.BILLI
     billOverdue?: boolean;
     billingIdReimbursementExpense?: BillingReimbursementExpneseEntityModel[];
     reimbursementExpense?: ReimbursementExpenseEntityModel[];
+    bank?: BankEntityModel[];
+    billingTimesheets?: BillingTimesheetEntityModel[];
     static relationConfigs: RelationConfigs<[
         EntityEnum.PROJECT,
         EntityEnum.CLIENT,
         EntityEnum.USER,
         EntityEnum.REIMBURSEMENT_EXPENSE,
-        EntityEnum.BILLING_REIMBURSEMENT_EXPENSE
+        EntityEnum.BILLING_REIMBURSEMENT_EXPENSE,
+        EntityEnum.BILLING_TIMESHEET,
+        EntityEnum.BANK
     ], EnumEntityType<EntityEnum.BILLING>>;
     static fromApiEntity(apiEntity: IBillingApiEntity): BillingEntityModel;
     getStatusCategory(): BillingStatusCategoryEnumForUI;