law-common 10.18.2-beta.3 → 10.18.2-beta.5

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

@@ -1,4 +1,8 @@
-import { EntityEnum, EntityIndexMap, EnumEntityType, VirtualEntityEnum } from "../interface/entity.utils.interface";
+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> {
     protected entityName: T;
     constructor(entityName: T);
@@ -6,5 +10,5 @@ export declare abstract class BaseEntityModel<T extends EntityEnum | VirtualEnti
     populateRelationsByIndex(entityIndexMap: EntityIndexMap): void;
     static populateRelationsForEntities(entityIndexMap: EntityIndexMap, entityType: EntityEnum): void;
     populateRelations(entityIndexMap: EntityIndexMap): void;
-    overwrite(entityIndexMap: EntityIndexMap, indexKey?: keyof EnumEntityType<T>): this;
+    overwrite(entityIndexMap: EntityIndexMap, indexKey?: string): this;
 }

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

@@ -1,58 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntityModel = void 0;
-const relation_type_enum_1 = require("../enums/relation-type.enum");
+exports.BaseEntityModel = exports.RelationType = void 0;
+var RelationType;
+(function (RelationType) {
+    RelationType["ONE"] = "one";
+    RelationType["MANY"] = "many";
+})(RelationType || (exports.RelationType = RelationType = {}));
 class BaseEntityModel {
     constructor(entityName) {
         this.entityName = entityName;
     }
     populateRelationsByIndex(entityIndexMap) {
         for (const relationConfig of this.getRelationConfigs() || []) {
-            if (relationConfig.relation === relation_type_enum_1.RelationType.ONE) {
-                // @ts-ignore
+            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) {
                 const relatedEntities = entityIndexMap[relationConfig.name] || {};
-                // @ts-ignore
                 let foundRelatedEntities = [];
-                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]]];
-                    }
+                if (thisMappingKey.includes(".")) {
+                    const [parentKey, childKey] = thisMappingKey.split(".");
+                    foundRelatedEntities = [relatedEntities[this[parentKey][childKey]]];
                 }
                 else {
-                    foundRelatedEntities = relatedEntities[
-                    // @ts-ignore
-                    this[relationConfig.mapKeyConfig.key]]
-                        ? // @ts-ignore
-                            [relatedEntities[this[relationConfig.mapKeyConfig.key]]]
-                        : [];
+                    // 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 = [];
+                    }
                 }
                 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 ${relationConfig.mapKeyConfig.key
-                    // @ts-ignore
-                    }=${this[relationConfig.mapKeyConfig.foreignKey]}`);
+                    console.warn(`No related entity found for ${relationConfig.name} with ${thisMappingKey}=${this[relationConfig.mapKeyConfig.foreignKey]}`);
                 }
-                // @ts-ignore
-                this[relationConfig.key] = foundRelatedEntities[0];
+                this[thisKey] = foundRelatedEntities[0];
             }
-            else if (relationConfig.relation === relation_type_enum_1.RelationType.MANY) {
-                // @ts-ignore
-                this[relationConfig.key] = [];
-                // @ts-ignore
+            else if (relationConfig.relation === RelationType.MANY) {
+                this[thisKey] = [];
                 const relatedEntities = entityIndexMap[relationConfig.name] || {};
                 for (const relatedEntity of Object.values(relatedEntities)) {
-                    if (
-                    // @ts-ignore
-                    relatedEntity[relationConfig.mapKeyConfig.relationKey] ===
-                        // @ts-ignore
-                        this[relationConfig.mapKeyConfig.key]) {
-                        // @ts-ignore
-                        this[relationConfig.key].push(relatedEntity);
+                    if (relatedEntity[relatedMappingKey] === this[thisMappingKey]) {
+                        this[thisKey].push(relatedEntity);
                     }
                 }
             }
@@ -60,7 +58,6 @@ class BaseEntityModel {
     }
     static populateRelationsForEntities(entityIndexMap, entityType) {
         for (const key of Object.keys(entityIndexMap[entityType] || {})) {
-            // @ts-ignore
             const entity = entityIndexMap[entityType][key];
             entity.populateRelationsByIndex(entityIndexMap);
         }
@@ -73,7 +70,6 @@ class BaseEntityModel {
             console.warn(`Entity of type ${this.entityName} does not have ${indexKey}, cannot merge`);
             return this;
         }
-        // @ts-ignore
         entityIndexMap[this.entityName][this[indexKey]] = this;
         return this;
     }

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

@@ -26,7 +26,6 @@ export declare class LeaveEntityModel extends BaseEntityModel<EntityEnum.LEAVE>
     createdByUser?: UserEntityModel;
     updatedByUser?: UserEntityModel;
     user?: UserEntityModel;
-    private constructor();
     static fromEntity(data: ILeaveApiEntity): LeaveEntityModel;
     getLeaveDuration(excludeWeekdays?: Weekday[], excludeDates?: DateCodeModel[]): number;
     static getLeaveDuration(leaves: LeaveEntityModel[], excludeWeekdays?: Weekday[], excludeDates?: DateCodeModel[], leaveStatusEnum?: LeaveStatusEnum[]): number;

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

@@ -4,31 +4,31 @@ exports.LeaveEntityModel = void 0;
 const utils_1 = require("../../utils");
 const string_util_1 = require("../../utils/string.util");
 const duration_type_enum_1 = require("../enums/duration-type.enum");
+const leave_type_enum_1 = require("../enums/leave-type.enum");
 const leave_status_enum_1 = require("../enums/leave.status.enum");
 const relation_type_enum_1 = require("../enums/relation-type.enum");
 const entity_utils_interface_1 = require("../interface/entity.utils.interface");
 const base_entity_model_1 = require("./base.entity.model");
 class LeaveEntityModel extends base_entity_model_1.BaseEntityModel {
-    constructor(data) {
-        super(entity_utils_interface_1.EntityEnum.LEAVE);
+    constructor() {
+        super(...arguments);
+        this.id = 0;
+        this.employeeId = 0;
+        this.fromDate = "";
+        this.toDate = "";
+        this.reason = "";
+        this.durationType = duration_type_enum_1.DurationTypeEnum.FULL;
+        this.status = leave_status_enum_1.LeaveStatusEnum.DELETED;
+        this.type = leave_type_enum_1.LeaveTypeEnum.SICK;
         this.createdOn = "";
         this.updatedOn = "";
-        this.id = data.id;
-        this.employeeId = data.employeeId;
-        this.fromDate = data.fromDate;
-        this.toDate = data.toDate;
-        this.reason = data.reason;
-        this.durationType = data.durationType;
-        this.status = data.status;
-        this.remark = data.remark;
-        this.type = data.type;
-        this.createdOn = data.createdOn;
-        this.updatedOn = data.updatedOn;
-        this.createdBy = data.createdBy;
-        this.updatedBy = data.updatedBy;
+        this.createdBy = 0;
+        this.updatedBy = 0;
     }
     static fromEntity(data) {
-        return new LeaveEntityModel(data);
+        const entity = new LeaveEntityModel(entity_utils_interface_1.EntityEnum.LEAVE);
+        Object.assign(entity, data);
+        return entity;
     }
     getLeaveDuration(excludeWeekdays = [], excludeDates = []) {
         if (!this.isMoreThanOneDayLeave()) {
@@ -111,7 +111,7 @@ class LeaveEntityModel extends base_entity_model_1.BaseEntityModel {
         return this.constructor.prototype.constructor.relationConfigs;
     }
     static fromApiEntity(apiEntity) {
-        return new LeaveEntityModel(apiEntity);
+        return LeaveEntityModel.fromEntity(apiEntity);
     }
     static getPendingApprovalStatuses() {
         return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "law-common",
-  "version": "10.18.2-beta.3",
+  "version": "10.18.2-beta.5",
   "description": "",
   "main": "dist/index.js",
   "files": [