@platform-modules/civil-aviation-authority 1.0.58 → 2.0.1

package/src/data-source.ts

@@ -1,68 +1,70 @@
-// src/data-source.ts
-import 'reflect-metadata';
-import { DataSource } from 'typeorm';
-import 'dotenv/config';
-import { User } from './models/user'; // import all entities here
-import { userSessions } from './models/user-sessions';
-import { Role } from './models/role';
-import { ITHelpDeskRequests } from './models/ITHelpDeskModel';
-import { ITServicesTypesSalalah } from './models/ITServicesTypesSalalahModel';
-import { ITServicesTypesMuscat } from './models/ITServicesTypesMuscatModel';
-import { CAAServices } from './models/CAAServices';
-import { CAASubServices } from './models/CAASubServices';
-import { ITApprovalSettings } from './models/ITApprovalSettings';
-// import { Workflows } from './models/Workflows';
-import { ItApprovalDetails } from './models/ItApprovalsModel';
-import { ItWorkFlow } from './models/ItWorkflowModel';
-import { WorkflowDefinitions } from './models/WorkflowDefinitions';
-import { WorkflowTask } from './models/WorkflowTask';
-import { Departments } from './models/DepartmentsModel';
-import { Sections } from './models/SectionModel';
-import { WorkflowHierarchy } from './models/WorkflowHierarchy';
-import { WorkflowTaskNames } from './models/WorkflowTaskNames';
-import { Directorate } from './models/DirectorateModel';
-import { Position } from './models/PositionModel';
-import { ServiceBookmarks } from './models/serviceBookmarksModel';
-import { ContactInfo } from './models/contactInfoModel';
-import { UserRole } from './models/userRolesModel';
-import { RoleRights } from './models/roleRightsModel';
-import { Notification } from './models/NotificationModel';
-
-
-
-export const AppDataSource = new DataSource({
-  type: 'postgres',
-  host: process.env.DB_HOST || 'localhost',
-  port: +(process.env.DB_PORT || 5432),
-  username: process.env.DB_USER || 'postgres',
-  password: process.env.DB_PASS || 'postgres',
-  database: process.env.DB_NAME || 'common_models',
-  synchronize: true, // auto-create tables (disable in prod)
-  logging: false,
-  entities: [
-    User,userSessions,
-    Role, 
-    ITHelpDeskRequests, 
-    ITServicesTypesSalalah, 
-    ITServicesTypesMuscat, 
-    CAAServices, 
-    CAASubServices, 
-    ITApprovalSettings, 
-    // Workflows, 
-    ItApprovalDetails, 
-    ItWorkFlow, 
-    WorkflowDefinitions, 
-    WorkflowTask, 
-    Departments, 
-    Sections, 
-    WorkflowHierarchy, 
-    WorkflowTaskNames, 
-    Directorate, 
-    Position,
-    ServiceBookmarks,
-    ContactInfo,
-    UserRole,
-    RoleRights,
-    Notification
-  ],
-});
+// src/data-source.ts
+import 'reflect-metadata';
+import { DataSource } from 'typeorm';
+import 'dotenv/config';
+import { User } from './models/user'; // import all entities here
+import { userSessions } from './models/user-sessions';
+import { Role } from './models/role';
+import { ITHelpDeskRequests } from './models/ITHelpDeskModel';
+import { ITServicesTypesSalalah } from './models/ITServicesTypesSalalahModel';
+import { ITServicesTypesMuscat } from './models/ITServicesTypesMuscatModel';
+import { ServiceType } from './models/ServiceTypeModel';
+import { CAAServices } from './models/CAAServices';
+import { CAASubServices } from './models/CAASubServices';
+import { ITApprovalSettings } from './models/ITApprovalSettings';
+// import { Workflows } from './models/Workflows';
+import { ItApprovalDetails } from './models/ItApprovalsModel';
+import { ItWorkFlow } from './models/ItWorkflowModel';
+import { WorkflowDefinitions } from './models/WorkflowDefinitions';
+import { WorkflowTask } from './models/WorkflowTask';
+import { Departments } from './models/DepartmentsModel';
+import { Sections } from './models/SectionModel';
+import { WorkflowHierarchy } from './models/WorkflowHierarchy';
+import { WorkflowTaskNames } from './models/WorkflowTaskNames';
+import { Directorate } from './models/DirectorateModel';
+import { Position } from './models/PositionModel';
+import { ServiceBookmarks } from './models/serviceBookmarksModel';
+import { ContactInfo } from './models/contactInfoModel';
+import { UserRole } from './models/userRolesModel';
+import { RoleRights } from './models/roleRightsModel';
+import { Notification } from './models/NotificationModel';
+
+
+
+export const AppDataSource = new DataSource({
+  type: 'postgres',
+  host: process.env.DB_HOST || 'localhost',
+  port: +(process.env.DB_PORT || 5432),
+  username: process.env.DB_USER || 'postgres',
+  password: process.env.DB_PASS || 'postgres',
+  database: process.env.DB_NAME || 'common_models',
+  synchronize: true, // auto-create tables (disable in prod)
+  logging: false,
+  entities: [
+    User,userSessions,
+    Role, 
+    ITHelpDeskRequests, 
+    ITServicesTypesSalalah, 
+    ITServicesTypesMuscat,
+    ServiceType,
+    CAAServices, 
+    CAASubServices, 
+    ITApprovalSettings, 
+    // Workflows, 
+    ItApprovalDetails, 
+    ItWorkFlow, 
+    WorkflowDefinitions, 
+    WorkflowTask, 
+    Departments, 
+    Sections, 
+    WorkflowHierarchy, 
+    WorkflowTaskNames, 
+    Directorate, 
+    Position,
+    ServiceBookmarks,
+    ContactInfo,
+    UserRole,
+    RoleRights,
+    Notification
+  ],
+});

package/src/index.ts

@@ -1,25 +1,26 @@
-export * from './models/user';
-export * from './models/role';
-export * from './models/user-sessions';
-export * from './models/ITHelpDeskModel';
-export * from './models/ITServicesTypesSalalahModel';
-export * from './models/ITServicesTypesMuscatModel';
-export * from './models/CAAServices';   
-export * from './models/CAASubServices';
-export * from './models/ITApprovalSettings';
-// export * from './models/Workflows';
-export * from './models/ItApprovalsModel';
-export * from './models/ItWorkflowModel';
-export * from './models/WorkflowDefinitions';
-export * from './models/WorkflowTask';
-export * from './models/DepartmentsModel';
-export * from './models/SectionModel';
-export * from './models/WorkflowHierarchy';
-export * from './models/WorkflowTaskNames';
-export * from './models/DirectorateModel';
-export * from './models/PositionModel';
-export * from './models/serviceBookmarksModel';
-export * from './models/contactInfoModel';
-export * from './models/userRolesModel';
-export * from './models/roleRightsModel';
-export * from './models/NotificationModel';
+export * from './models/user';
+export * from './models/role';
+export * from './models/user-sessions';
+export * from './models/ITHelpDeskModel';
+export * from './models/ITServicesTypesSalalahModel';
+export * from './models/ITServicesTypesMuscatModel';
+export * from './models/ServiceTypeModel';
+export * from './models/CAAServices';   
+export * from './models/CAASubServices';
+export * from './models/ITApprovalSettings';
+// export * from './models/Workflows';
+export * from './models/ItApprovalsModel';
+export * from './models/ItWorkflowModel';
+export * from './models/WorkflowDefinitions';
+export * from './models/WorkflowTask';
+export * from './models/DepartmentsModel';
+export * from './models/SectionModel';
+export * from './models/WorkflowHierarchy';
+export * from './models/WorkflowTaskNames';
+export * from './models/DirectorateModel';
+export * from './models/PositionModel';
+export * from './models/serviceBookmarksModel';
+export * from './models/contactInfoModel';
+export * from './models/userRolesModel';
+export * from './models/roleRightsModel';
+export * from './models/NotificationModel';

package/src/models/BaseModel.ts

@@ -1,47 +1,47 @@
-import moment from "moment-timezone";  
-import {   
-    Column,   
-    CreateDateColumn,   
-    UpdateDateColumn,   
-    BeforeInsert,   
-    PrimaryGeneratedColumn   
-} from 'typeorm';  
-
-export abstract class Model0 {  
-    jsonIgnore: string[] = ['logicalDelete', 'is_deleted', 'jsonIgnore'];
-
-    @Column({ nullable: false })  
-    created_by?: string = '';  
-
-    @CreateDateColumn({ type: "timestamptz", default: () => "CURRENT_TIMESTAMP" })  
-    created_at?: Date;  
-
-    @Column({ nullable: true })  
-    updated_by?: string = '';  
-
-    @UpdateDateColumn({ type: "timestamptz", default: () => "CURRENT_TIMESTAMP" })  
-    updated_at?: Date;  
-
-    @BeforeInsert()  
-    insertCreated() {  
-        const currentTime = moment().utc().tz('Asia/Kolkata').toDate();  
-        this.created_at = currentTime;  
-        this.updated_at = currentTime;  
-    }  
-
-    @Column({ nullable: true, default: false })  
-    is_deleted?: boolean = false;  
-
-    constructor() {  
-    }  
-}  
-
-export abstract class BaseModel extends Model0 {  
-    @PrimaryGeneratedColumn()  
-    id: number;  
-
-    constructor() {  
-        super();  
-        this.id = 0; // This will be set by the database when the entity is saved  
-    }  
+import moment from "moment-timezone";  
+import {   
+    Column,   
+    CreateDateColumn,   
+    UpdateDateColumn,   
+    BeforeInsert,   
+    PrimaryGeneratedColumn   
+} from 'typeorm';  
+
+export abstract class Model0 {  
+    jsonIgnore: string[] = ['logicalDelete', 'is_deleted', 'jsonIgnore'];
+
+    @Column({ type: 'integer', nullable: true })  
+    created_by?: number;  
+
+    @CreateDateColumn({ type: "timestamptz", default: () => "CURRENT_TIMESTAMP" })  
+    created_at?: Date;  
+
+    @Column({ type: 'integer', nullable: true })  
+    updated_by?: number;  
+
+    @UpdateDateColumn({ type: "timestamptz", default: () => "CURRENT_TIMESTAMP" })  
+    updated_at?: Date;  
+
+    @BeforeInsert()  
+    insertCreated() {  
+        const currentTime = moment().utc().tz('Asia/Kolkata').toDate();  
+        this.created_at = currentTime;  
+        this.updated_at = currentTime;  
+    }  
+
+    @Column({ nullable: true, default: false })  
+    is_deleted?: boolean = false;  
+
+    constructor() {  
+    }  
+}  
+
+export abstract class BaseModel extends Model0 {  
+    @PrimaryGeneratedColumn()  
+    id: number;  
+
+    constructor() {  
+        super();  
+        this.id = 0; // This will be set by the database when the entity is saved  
+    }  
 }  

package/src/models/CAAServices.ts

@@ -14,19 +14,15 @@ export class CAAServices extends BaseModel {
     @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/CAASubServices.ts

@@ -1,6 +1,7 @@
 
-import { Column, Entity } from "typeorm";
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
 import { BaseModel } from './BaseModel';
+import { CAAServices } from './CAAServices';
 
 @Entity({ name: 'caa_sub_services' })
 export class CAASubServices extends BaseModel {
@@ -17,6 +18,10 @@ export class CAASubServices extends BaseModel {
     @Column({ nullable: true })
     service_id: number;
 
+    @ManyToOne(() => CAAServices)
+    @JoinColumn({ name: 'service_id' })
+    service: CAAServices;
+
     @Column({ nullable: true })
     logo_url: string;
 

package/src/models/ITHelpDeskModel.ts

@@ -1,98 +1,115 @@
-
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-export enum ContactFor {
-  SELF = "Self",
-  BEHALFOF = "Behalf of"
-}
-export enum status {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-@Entity({ name: 'IT_Help_Desk_Requests' })
-export class ITHelpDeskRequests extends BaseModel {
-
-    @Column({ nullable: false })
-    department: string;
-
-    @Column({ nullable: false })
-    service_type: string;
-
-    @Column({ nullable: false })
-    problem: string;
-
-    @Column({
-        type: "enum",
-        enum: ContactFor,
-        default: ContactFor.SELF,
-        nullable: false,
-    })
-    request_for: ContactFor;
-
-    @Column({ nullable: false })
-    description: string;
-
-    @Column({ nullable: false })
-    extn_num: string;
-
-    @Column({ nullable: false })
-    contact_num: string;
-
-    @Column({ type: "date", nullable: false })
-    request_date: Date;
-
-    @Column({ nullable: true })
-    attachment_url: string;
-
-    @Column({ nullable: false })
-    user_id: number;
-
-    @Column({ nullable: true })
-    reporting_manager: number;
-
-    @Column({ nullable: true })
-    assigned_to: number;
-
-    @Column({
-        type: "enum",
-        enum: status,
-        default: status.PENDING,
-        nullable: false,
-    })
-    status: status;
-
-    @Column({ type: "varchar", nullable: true })
-    workflow_execution_id: string | null;
-
-    constructor(     
-        department: string,
-        service_type: string, 
-        problem: string,       
-        request_for: ContactFor,       
-        description: string,
-        extn_num: string,
-        contact_num: string, 
-        request_date: Date,
-        attachment_url: string,
-        reporting_manager: number,
-        assigned_to: number,
-        status: status,     
-        workflow_execution_id?: string,
-    ) {
-        super();     
-        this.department = department,
-        this.service_type = service_type,
-        this.problem = problem,
-        this.request_for = request_for,
-        this.description = description,
-        this.extn_num = extn_num,
-        this.contact_num = contact_num,
-        this.request_date = request_date,
-        this.attachment_url = attachment_url,
-        this.reporting_manager = reporting_manager,
-        this.assigned_to = assigned_to,
-        this.status = status,
-        this.workflow_execution_id = workflow_execution_id || null
-    }
+
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+export enum ContactFor {
+  SELF = "Self",
+  BEHALFOF = "Behalf of"
+}
+export enum status {
+  PENDING = "Pending",
+  ASSIGNED = "Assigned",
+  IN_PROGRESS = "In Progress",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+@Entity({ name: 'it_help_desk_requests' })
+export class ITHelpDeskRequests extends BaseModel {
+
+    @Column({ type: 'int', nullable: true })
+    req_user_department_id: number | null;
+
+    @Column({ type: 'int', nullable: true })
+    req_user_section_id: number | null;
+
+    @Column({ nullable: true })
+    service_id: number;
+
+    @Column({ nullable: true })
+    sub_service_id: number;
+
+    @Column({ type: 'int', nullable: true })
+    service_type_id: number | null;
+
+    @Column({ nullable: false })
+    problem: string;
+
+    @Column({
+        type: "enum",
+        enum: ContactFor,
+        default: ContactFor.SELF,
+        nullable: false,
+    })
+    request_for: ContactFor;
+
+    @Column({ nullable: false })
+    description: string;
+
+    @Column({ nullable: false })
+    extn_num: string;
+
+    @Column({ nullable: false })
+    contact_num: string;
+
+    @Column({ type: "date", nullable: false })
+    request_date: Date;
+
+    @Column({ nullable: true })
+    attachment_url: string;
+
+    @Column({ nullable: false })
+    user_id: number;
+
+    @Column({ nullable: true })
+    reporting_manager: number;
+
+    @Column({ nullable: true })
+    assigned_to: number;
+
+    @Column({
+        type: "enum",
+        enum: status,
+        default: status.PENDING,
+        nullable: false,
+    })
+    status: status;
+
+    @Column({ type: "varchar", nullable: true })
+    workflow_execution_id: string | null;
+
+    constructor(     
+        service_id: number,
+        sub_service_id: number, 
+        problem: string,       
+        request_for: ContactFor,       
+        description: string,
+        extn_num: string,
+        contact_num: string, 
+        request_date: Date,
+        attachment_url: string,
+        reporting_manager: number,
+        assigned_to: number,
+        status: status,     
+        workflow_execution_id?: string,
+        req_user_department_id?: number | null,
+        req_user_section_id?: number | null,
+        service_type_id?: number | null
+    ) {
+        super();     
+        this.service_id = service_id;
+        this.sub_service_id = sub_service_id;
+        this.problem = problem;
+        this.request_for = request_for;
+        this.description = description;
+        this.extn_num = extn_num;
+        this.contact_num = contact_num;
+        this.request_date = request_date;
+        this.attachment_url = attachment_url;
+        this.reporting_manager = reporting_manager;
+        this.assigned_to = assigned_to;
+        this.status = status;
+        this.workflow_execution_id = workflow_execution_id || null;
+        this.req_user_department_id = req_user_department_id || null;
+        this.req_user_section_id = req_user_section_id || null;
+        this.service_type_id = service_type_id || null;
+    }
 }

package/src/models/ItApprovalsModel.ts

@@ -1,40 +1,62 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-
-export enum ApprovalStatus {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected"
-}
-
-@Entity({ name: 'it_approvals' })
-export class ItApprovalDetails extends BaseModel {
-  @Column({ type: 'int', nullable: false })
-  request_id: number;
-
-  @Column({ type: 'int', nullable: false })
-  level: number;
-
-  @Column({ type: 'int', nullable: true })
-  approver_user_id: number;
-
-  @Column({ type: 'int', nullable: false })
-  approver_role_id: number;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  comment: string;
-
-  @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
-  approval_status: ApprovalStatus;
-
-    constructor(request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number) {
-    super();
-    this.request_id = request_id;
-    this.approver_user_id = approver_user_id;
-    this.approver_role_id = approver_role_id;
-    this.comment = comment;
-    this.approval_status = approval_status;
-    this.level = level;
-  }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+export enum ApprovalStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected"
+}
+
+@Entity({ name: 'it_approvals' })
+export class ItApprovalDetails extends BaseModel {
+  @Column({ type: 'integer', nullable: false })
+  request_id: number;
+
+  @Column({ type: 'integer', nullable: false })
+  level: number;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: false })
+  approver_role_id: number;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  approved_by: number | null;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  comment: string;
+
+  @Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
+  approval_status: ApprovalStatus;
+
+    constructor(
+      request_id: number, 
+      approver_user_id: number | null, 
+      approver_role_id: number, 
+      comment: string, 
+      approval_status: ApprovalStatus, 
+      level: number,
+      department_id?: number | null,
+      section_id?: number | null,
+      approved_by?: number | null
+    ) {
+    super();
+    this.request_id = request_id;
+    this.approver_user_id = approver_user_id;
+    this.approver_role_id = approver_role_id;
+    this.comment = comment;
+    this.approval_status = approval_status;
+    this.level = level;
+    this.department_id = department_id || null;
+    this.section_id = section_id || null;
+    this.approved_by = approved_by || null;
+  }
 }