@platform-modules/foreign-ministry 1.0.27 → 1.0.28

package/src/data-source.ts

@@ -12,22 +12,10 @@ import { HajjLeaveDates } from './models/HajjLeaveDatesModel';
 import { StudyLeaveDegrees } from './models/StudyLeaveDegreesModel';
 import { UnpaidLeaveCategories } from './models/UnpaidLeaveCatgoriesModel';
 import { MounringLeaveRelations } from './models/MounringLeaveRelationModel';
-import { LeaveSettings } from './models/LeaveSettingsModel';
-import { LeaveApprovalDetails } from './models/LeaveApprovalsModel';
-import { LeaveAttachments } from './models/LeaveAttachmentsModel';
-import { LeaveChat } from './models/LeaveChatModel';
-import { LeaveWorkFlow } from './models/LeaveWorkFlowModel';
-import { Sections } from './models/SectionModel';
-import { Designation } from './models/DesignationModel';
-import { Departments } from './models/DepartmentsModel';
-import { Division } from './models/DivisionModel';
-
-
-import { Faqs } from './models/faqsModel';
-import { QuestionTags } from './models/questionTagsModel';
-import { Conversation } from './models/ConversationModel';
-import { ConversationParticipant } from './models/ConversationParticipantModel';
-import { Message } from './models/MessageModel';
+import { LeaveApprovalMatrix } from './models/LeaveApprovalMatrixModel';
+import { LeaveApprovalDetails } from './models/LeaveApprovalDetailsModel';
+import { FMServices } from './models/FMServices';
+import { FMSubServices } from './models/FMSubservices';
 
 
 export const AppDataSource = new DataSource({
@@ -39,30 +27,5 @@ export const AppDataSource = new DataSource({
   database: process.env.DB_NAME || 'common_models',
   synchronize: true, // auto-create tables (disable in prod)
   logging: false,
-  entities: [
-    User,
-    userSessions,
-    Role,
-    LeaveRequests,
-    LeaveTypes,
-    FinancialGrade,
-    HajjLeaveDates,
-    StudyLeaveDegrees,
-    UnpaidLeaveCategories,
-    MounringLeaveRelations,
-    LeaveSettings,
-    LeaveApprovalDetails,
-    LeaveAttachments,
-    LeaveChat,
-    LeaveWorkFlow,
-    Sections,
-    Designation,
-    Departments,
-    Division,
-    Faqs,
-    QuestionTags,
-    Conversation,
-    ConversationParticipant,
-    Message
-  ],
+  entities: [User,userSessions,Role,LeaveRequests,LeaveTypes,FinancialGrade,HajjLeaveDates,StudyLeaveDegrees,UnpaidLeaveCategories,MounringLeaveRelations,LeaveApprovalMatrix,LeaveApprovalDetails,FMServices,FMSubServices],
 });

package/src/index.ts

@@ -8,17 +8,7 @@ export * from './models/HajjLeaveDatesModel';
 export * from './models/StudyLeaveDegreesModel';
 export * from './models/UnpaidLeaveCatgoriesModel';
 export * from './models/MounringLeaveRelationModel';
-export * from './models/LeaveSettingsModel';
-export * from './models/LeaveApprovalsModel';
-export * from './models/LeaveAttachmentsModel';
-export * from './models/LeaveChatModel';
-export * from './models/LeaveWorkFlowModel';
-export * from './models/SectionModel';
-export * from './models/DesignationModel';
-export * from './models/DepartmentsModel';
-export * from './models/DivisionModel';
-export * from './models/faqsModel';
-export * from './models/questionTagsModel';
-export * from './models/ConversationModel';
-export * from './models/ConversationParticipantModel';
-export * from './models/MessageModel';
+export * from './models/LeaveApprovalMatrixModel';
+export * from './models/LeaveApprovalDetailsModel';
+export * from './models/FMServices';
+export * from './models/FMSubservices';

package/src/models/FMServices.ts

@@ -0,0 +1,32 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'fm_services' })
+export class FMServices extends BaseModel {
+
+    @Column({ type: 'varchar', length: 64, nullable: false, unique: true })
+    code: string;
+
+    @Column({ nullable: false })
+    name: string;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ nullable: false })
+    logo_url: string;
+
+    constructor(     
+        name: string,
+        description: string,
+        logo_url: string,
+        code?: string
+    ) {
+        super();     
+        this.name = name;
+        this.description = description;
+        this.logo_url = logo_url;
+        this.code = code || '';
+    }
+}

package/src/models/FMSubservices.ts

@@ -0,0 +1,37 @@
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'fm_sub_services' })
+export class FMSubServices extends BaseModel {
+
+    @Column({ type: 'varchar', length: 64, nullable: true, unique: true })
+    code: string | null;
+
+    @Column({ nullable: false })
+    sub_service_name: string;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ nullable: true })
+    service_id: number;
+
+    @Column({ nullable: true })
+    logo_url: string;
+
+    constructor(     
+        sub_service_name: string,
+        description: string,
+        service_id: number,
+        logo_url: string,
+        code: string | null = null
+    ) {
+        super();     
+        this.sub_service_name = sub_service_name
+        this.description = description
+        this.service_id = service_id
+        this.logo_url = logo_url
+        this.code = code
+    }
+}

package/src/models/LeaveApprovalDetailsModel.ts

@@ -0,0 +1,25 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+//This model is used to store the store the leave apporval details of the user for the leave request
+@Entity({ name: 'leave_approval_details' })
+export class LeaveApprovalDetails extends BaseModel {
+  @Column({ type: 'int', nullable: false })
+  leave_request_id: number;
+
+  @Column({ type: 'int', nullable: false })
+  level: number;
+
+  @Column({ type: 'int', nullable: false })
+  approver_id: number;
+
+  @Column({ type: 'int', nullable: false })
+  approval_status: number;
+
+  constructor(leave_request_id: number, approver_id: number, approval_status: number, level: number) {
+    super();
+    this.leave_request_id = leave_request_id;
+    this.approver_id = approver_id;
+    this.approval_status = approval_status;
+    this.level = level;
+  }
+}

package/src/models/{LeaveSettingsModel.ts → LeaveApprovalMatrixModel.ts}

@@ -1,21 +1,21 @@
 import { Column, Entity } from "typeorm";
 import { BaseModel } from './BaseModel';
 //This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
-@Entity({ name: 'leave_settings' })
-export class LeaveSettings extends BaseModel {
+@Entity({ name: 'leave_approval_matrix' })
+export class LeaveApprovalMatrix extends BaseModel {
   @Column({ type: 'int', nullable: false })
   leave_type: number;
 
   @Column({ type: 'int', nullable: false })
   level: number;
 
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  leave_approval_authority: string;
+  @Column({ type: 'int', nullable: false })
+  approval_matrix: number;
 
-  constructor(leave_type: number, level: number, leave_approval_authority: string) {
+  constructor(leave_type: number, level: number, approval_matrix: number) {
     super();
     this.leave_type = leave_type;
     this.level = level;
-    this.leave_approval_authority = leave_approval_authority;
+    this.approval_matrix = approval_matrix;
   }
 }

package/src/models/user.ts

@@ -1,151 +1,100 @@
-import { Column, Entity } from "typeorm";
+
+import { Column, Entity ,BeforeInsert,BeforeUpdate } from "typeorm";
 import { BaseModel } from './BaseModel';
 
 @Entity({ name: 'users' })
 export class User extends BaseModel {
   
-    @Column({ type: 'bigint', nullable: true })
-    employee_id?: number;
-
-    @Column({ nullable: true })
-    employee_name?: string;
-
-    @Column({ nullable: true })
-    employee_arabic_name?: string;
-
-    @Column({ nullable: true, type: 'date' })
-    date_of_birth?: string;
-
     @Column({ nullable: true })
-    region_of_birth?: string;
+    first_name: string;
 
     @Column({ nullable: true })
-    country_of_birth?: string;
-
-    @Column({ nullable: true, type: 'date' })
-    date_of_joining?: string;
-
-    @Column({ nullable: true ,type: 'date'})
-    last_promotion_date?: string;
+    last_name: string;
 
     @Column({ nullable: true })
-    gender?: string;
+    full_name: string;
 
     @Column({ nullable: true })
-    marital_status?: string;
+    password: string;
 
     @Column({ nullable: true })
-    nationality?: string;
+    mobile: string;
 
     @Column({ nullable: true })
-    email?: string;
+    email: string;
 
     @Column({ nullable: true })
-    blood_group?: string;
-
-    @Column({ type: 'bigint', nullable: true })
-    national_id?: number;
+    address: string;
 
     @Column({ nullable: true })
-    mobile?: string;
+    city: string;
 
     @Column({ nullable: true })
-    department?: number;
+    state: string;
 
     @Column({ nullable: true })
-    section?: number;
+    country: string;
 
     @Column({ nullable: true })
-    designation?: number;
+    pincode: string;
 
-    @Column({ nullable: true })
-    grade?: number;
+    @Column({ nullable: true, default: true })
+    is_active: boolean;
 
     @Column({ nullable: true })
-    location?: string;
+    EncryptPassword: string;
 
     @Column({ nullable: true })
-    country?: string;
+    roleId: number;
 
-    @Column({ nullable: true , default: false})
-    is_admin?: boolean;
+    // @Column({ nullable: true })
+    // contract_start_date: string;
 
-    @Column({ nullable: true })
-    division?: number;
+    // @Column({ nullable: true })
+    // contract_end_date: string;
 
     @Column({ nullable: true })
-    reporting_to?: number;
-
-    @Column({ nullable: true })
-    address?: string;
-
-    @Column({ nullable: true })
-    residential_status?: string;
-
-    @Column({ nullable: true })
-    religion?: string;
-
-    @Column({ nullable: true })
-    avatar?: string;
+    company: string;
 
     constructor(     
-        employee_id?: number,
-        employee_name?: string,
-        employee_arabic_name?: string,
-        date_of_birth?: string,
-        region_of_birth?: string,
-        country_of_birth?: string,
-        date_of_joining?: string,
-        last_promotion_date?: string,
-        gender?: string,
-        marital_status?: string,
-        nationality?: string,
-        email?: string,
-        blood_group?: string,
-        national_id?: number,
-        mobile?: string,
-        department?: number,
-        section?: number,
-        grade?: number,
-        location?: string,
-        country?: string,
-        is_admin?: boolean,
-        division?: number,
-        reporting_to?: number,
-        address?: string,
-        residential_status?: string,
-        religion?: string,
-        designation?: number,
-        avatar?: string,
+        first_name: string,
+        last_name: string, 
+        full_name: string,       
+        password: string,
+        mobile: string,
+        email: string, 
+        address: string,
+        city: string,
+        state: string,
+        country: string,
+        pincode: string,
+        is_active: boolean,
+        EncryptPassword: string,
+        roleId: number,
+        // contract_start_date: string,
+        // contract_end_date: string,
+        company: string
+
     ) {
         super();     
-        this.employee_id = employee_id;
-        this.employee_name = employee_name;
-        this.employee_arabic_name = employee_arabic_name;
-        this.date_of_birth = date_of_birth;
-        this.region_of_birth = region_of_birth;
-        this.country_of_birth = country_of_birth;
-        this.date_of_joining = date_of_joining;
-        this.last_promotion_date = last_promotion_date;
-        this.gender = gender;
-        this.marital_status = marital_status;
-        this.nationality = nationality;
-        this.email = email;
-        this.blood_group = blood_group;
-        this.national_id = national_id;
-        this.mobile = mobile;
-        this.department = department;
-        this.section = section;
-        this.grade = grade;
-        this.location = location;
-        this.country = country;
-        this.is_admin = is_admin;
-        this.division = division;
-        this.reporting_to = reporting_to;
-        this.address = address;
-        this.residential_status = residential_status;
-        this.religion = religion;
-        this.designation = designation;
-        this.avatar = avatar;
+        this.first_name = first_name,
+        this.last_name = last_name,
+        this.full_name = full_name ,
+        this.password = password,
+        this.EncryptPassword = EncryptPassword,
+        this.mobile = mobile,
+        this.email = email,
+        this.is_active = is_active,       
+        this.address = address,
+        this.city = city,
+        this.state = state,
+        this.country = country,
+        this.pincode = pincode,
+        this.roleId = roleId,
+        // this.contract_start_date = contract_start_date,
+        // this.contract_end_date = contract_end_date,
+        this.company = company
     }
-}
+}
+
+

package/dist/models/ConversationModel.d.ts

@@ -1,16 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { ConversationParticipant } from './ConversationParticipantModel';
-import { Message } from './MessageModel';
-export declare enum ConversationType {
-    DIRECT = "Direct",
-    GROUP = "Group"
-}
-export declare class Conversation extends BaseModel {
-    conversationType: ConversationType;
-    conversationName?: string;
-    createdAt: Date;
-    updatedAt?: Date;
-    participants?: ConversationParticipant[];
-    messages?: Message[];
-    constructor(conversationType?: ConversationType, conversationName?: string, createdAt?: Date, updatedAt?: Date);
-}

package/dist/models/ConversationModel.js

@@ -1,64 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Conversation = exports.ConversationType = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const ConversationParticipantModel_1 = require("./ConversationParticipantModel");
-const MessageModel_1 = require("./MessageModel");
-var ConversationType;
-(function (ConversationType) {
-    ConversationType["DIRECT"] = "Direct";
-    ConversationType["GROUP"] = "Group";
-})(ConversationType || (exports.ConversationType = ConversationType = {}));
-let Conversation = class Conversation extends BaseModel_1.BaseModel {
-    constructor(conversationType, conversationName, createdAt, updatedAt) {
-        super();
-        this.conversationType = conversationType || ConversationType.DIRECT;
-        this.conversationName = conversationName;
-        this.createdAt = createdAt || new Date();
-        this.updatedAt = updatedAt;
-    }
-};
-exports.Conversation = Conversation;
-__decorate([
-    (0, typeorm_1.Column)({
-        type: 'enum',
-        enum: ConversationType,
-        default: ConversationType.DIRECT
-    }),
-    __metadata("design:type", String)
-], Conversation.prototype, "conversationType", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
-    __metadata("design:type", String)
-], Conversation.prototype, "conversationName", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
-    __metadata("design:type", Date)
-], Conversation.prototype, "createdAt", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
-    __metadata("design:type", Date)
-], Conversation.prototype, "updatedAt", void 0);
-__decorate([
-    (0, typeorm_1.OneToMany)(() => ConversationParticipantModel_1.ConversationParticipant, participant => participant.conversation),
-    __metadata("design:type", Array)
-], Conversation.prototype, "participants", void 0);
-__decorate([
-    (0, typeorm_1.OneToMany)(() => MessageModel_1.Message, message => message.conversation),
-    __metadata("design:type", Array)
-], Conversation.prototype, "messages", void 0);
-exports.Conversation = Conversation = __decorate([
-    (0, typeorm_1.Entity)({ name: 'conversations' }),
-    __metadata("design:paramtypes", [String, String, Date,
-        Date])
-], Conversation);

package/dist/models/ConversationParticipantModel.d.ts

@@ -1,14 +0,0 @@
-import { BaseModel } from './BaseModel';
-import { Conversation } from './ConversationModel';
-import { User } from './user';
-export declare class ConversationParticipant extends BaseModel {
-    conversationId: number;
-    userId: number;
-    roleId: number;
-    joinedAt: Date;
-    createdAt: Date;
-    updatedAt?: Date;
-    conversation?: Conversation;
-    user?: User;
-    constructor(conversationId?: number, userId?: number, roleId?: number, joinedAt?: Date, createdAt?: Date, updatedAt?: Date);
-}

package/dist/models/ConversationParticipantModel.js

@@ -1,68 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConversationParticipant = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-const ConversationModel_1 = require("./ConversationModel");
-const user_1 = require("./user");
-let ConversationParticipant = class ConversationParticipant extends BaseModel_1.BaseModel {
-    constructor(conversationId, userId, roleId, joinedAt, createdAt, updatedAt) {
-        super();
-        this.conversationId = conversationId || 0;
-        this.userId = userId || 0;
-        this.roleId = roleId || 0;
-        this.joinedAt = joinedAt || new Date();
-        this.createdAt = createdAt || new Date();
-        this.updatedAt = updatedAt;
-    }
-};
-exports.ConversationParticipant = ConversationParticipant;
-__decorate([
-    (0, typeorm_1.Column)({ type: 'bigint' }),
-    __metadata("design:type", Number)
-], ConversationParticipant.prototype, "conversationId", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int' }),
-    __metadata("design:type", Number)
-], ConversationParticipant.prototype, "userId", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'int' }),
-    __metadata("design:type", Number)
-], ConversationParticipant.prototype, "roleId", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
-    __metadata("design:type", Date)
-], ConversationParticipant.prototype, "joinedAt", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' }),
-    __metadata("design:type", Date)
-], ConversationParticipant.prototype, "createdAt", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
-    __metadata("design:type", Date)
-], ConversationParticipant.prototype, "updatedAt", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => ConversationModel_1.Conversation, conversation => conversation.participants),
-    (0, typeorm_1.JoinColumn)({ name: 'conversationId' }),
-    __metadata("design:type", ConversationModel_1.Conversation)
-], ConversationParticipant.prototype, "conversation", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => user_1.User),
-    (0, typeorm_1.JoinColumn)({ name: 'userId' }),
-    __metadata("design:type", user_1.User)
-], ConversationParticipant.prototype, "user", void 0);
-exports.ConversationParticipant = ConversationParticipant = __decorate([
-    (0, typeorm_1.Entity)({ name: 'conversation_participants' }),
-    __metadata("design:paramtypes", [Number, Number, Number, Date,
-        Date,
-        Date])
-], ConversationParticipant);

package/dist/models/DepartmentsModel.d.ts

@@ -1,7 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Departments extends BaseModel {
-    department_name: string;
-    department_code: string;
-    department_description: string;
-    constructor(department_name: string, department_code: string, department_description: string);
-}

package/dist/models/DesignationModel.d.ts

@@ -1,6 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Designation extends BaseModel {
-    name: string;
-    is_deleted?: boolean;
-    constructor(name: string, is_deleted: boolean);
-}

package/dist/models/DesignationModel.js

@@ -1,34 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Designation = void 0;
-const typeorm_1 = require("typeorm");
-const BaseModel_1 = require("./BaseModel");
-let Designation = class Designation extends BaseModel_1.BaseModel {
-    constructor(name, is_deleted) {
-        super();
-        this.name = name;
-        this.is_deleted = is_deleted;
-    }
-};
-exports.Designation = Designation;
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
-], Designation.prototype, "name", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Boolean)
-], Designation.prototype, "is_deleted", void 0);
-exports.Designation = Designation = __decorate([
-    (0, typeorm_1.Entity)({ name: 'designation' }),
-    __metadata("design:paramtypes", [String, Boolean])
-], Designation);

package/dist/models/DivisionModel.d.ts

@@ -1,6 +0,0 @@
-import { BaseModel } from './BaseModel';
-export declare class Division extends BaseModel {
-    name: string;
-    is_deleted?: boolean;
-    constructor(name: string, is_deleted: boolean);
-}