@platform-modules/civil-aviation-authority 2.0.90 → 2.1.1

package/src/models/ITHelpDeskModel.ts

@@ -1,121 +1,101 @@
-
-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: 'varchar', length: 255, nullable: true })
-    email: string | null;
-
-    @Column({ type: 'varchar', length: 30, nullable: true })
-    request_type: string;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    person_name: string | null;
-
-    @Column({ type: 'varchar', length: 20, nullable: true })
-    person_contact_number: string | null;
-
-    @Column({ type: "date", nullable: false })
-    request_date: Date;
-
-    @Column({ nullable: false })
-    user_id: 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,
-        status: status,     
-        workflow_execution_id?: string,
-        req_user_department_id?: number | null,
-        req_user_section_id?: number | null,
-        service_type_id?: number | null,
-        person_name?: string | null,
-        person_contact_number?: string | null,
-        email?: string | null,
-        request_type?: string
-    ) {
-        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.email = email || null;
-        this.request_type = request_type || 'internal';
-        this.person_name = person_name || null;
-        this.person_contact_number = person_contact_number || null;
-        this.request_date = request_date;
-        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;
-    }
+
+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: false })
+    user_id: 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,
+        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.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/ITRequestAttachmentModel.ts

@@ -13,12 +13,6 @@ export class ITRequestAttachment extends BaseModel {
     @JoinColumn({ name: 'request_id' })
     request: ITHelpDeskRequests;
 
-    @Column({ type: 'integer', nullable: true })
-    service_id: number | null;
-
-    @Column({ type: 'integer', nullable: true })
-    sub_service_id: number | null;
-
     @Column({ type: 'integer', nullable: false })
     uploaded_by: number;
 
@@ -48,9 +42,7 @@ export class ITRequestAttachment extends BaseModel {
         file_name?: string,
         file_type?: string,
         file_size?: number,
-        description?: string,
-        service_id?: number | null,
-        sub_service_id?: number | null
+        description?: string
     ) {
         super();
         this.request_id = request_id;
@@ -60,8 +52,6 @@ export class ITRequestAttachment extends BaseModel {
         this.file_type = file_type || '';
         this.file_size = file_size || null;
         this.description = description || '';
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
     }
 }
 

package/src/models/ItApprovalsModel.ts

@@ -13,12 +13,6 @@ export class ItApprovalDetails extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   request_id: number;
 
-  @Column({ type: 'integer', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  sub_service_id: number | null;
-
   @Column({ type: 'integer', nullable: false })
   level: number;
 
@@ -52,9 +46,7 @@ export class ItApprovalDetails extends BaseModel {
       level: number,
       department_id?: number | null,
       section_id?: number | null,
-      approved_by?: number | null,
-      service_id?: number | null,
-      sub_service_id?: number | null
+      approved_by?: number | null
     ) {
     super();
     this.request_id = request_id;
@@ -66,7 +58,5 @@ export class ItApprovalDetails extends BaseModel {
     this.department_id = department_id || null;
     this.section_id = section_id || null;
     this.approved_by = approved_by || null;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
   }
 }

package/src/models/ItWorkflowModel.ts

@@ -13,12 +13,6 @@ export class ItWorkFlow extends BaseModel {
   @Column({ type: 'int', nullable: false })
   request_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  service_id: number | null;
-
-  @Column({ type: 'int', nullable: true })
-  sub_service_id: number | null;
-
   @Column({ type: 'int', nullable: true })
   order: number | null;
 
@@ -28,13 +22,11 @@ export class ItWorkFlow extends BaseModel {
   @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
   status: workFlowStatus;
 
-  constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null) {
+  constructor(request_id: number, content: string, status: workFlowStatus, order?: number) {
     super();
     this.request_id = request_id;
     this.content = content;
     this.status = status;
     this.order = order || null;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
   }
 }

package/src/models/VpnApprovalModel.ts

@@ -5,8 +5,7 @@ export enum VpnApprovalStatus {
   PENDING = "Pending",
   IN_PROGRESS = "In Progress",
   APPROVED = "Approved",
-  REJECTED = "Rejected",
-  ASSIGNED = "Assigned"
+  REJECTED = "Rejected"
 }
 
 @Entity({ name: "vpn_approvals" })
@@ -43,9 +42,6 @@ export class VpnApprovalDetails extends BaseModel {
   })
   approval_status: VpnApprovalStatus;
 
-  @Column({ type: "boolean", default: false, nullable: false })
-  is_manager: boolean;
-
   constructor(
     request_id: number,
     approver_user_id: number | null,
@@ -55,8 +51,7 @@ export class VpnApprovalDetails extends BaseModel {
     level: number,
     department_id?: number | null,
     section_id?: number | null,
-    approved_by?: number | null,
-    is_manager?: boolean
+    approved_by?: number | null
   ) {
     super();
     this.request_id = request_id;
@@ -68,7 +63,6 @@ export class VpnApprovalDetails extends BaseModel {
     this.department_id = department_id || null;
     this.section_id = section_id || null;
     this.approved_by = approved_by || null;
-    this.is_manager = is_manager ?? false;
   }
 }
 

package/src/models/WorkflowTask.ts

@@ -24,15 +24,6 @@ export class WorkflowTask extends BaseModel {
     @Column({ type: 'varchar', length: 100, nullable: false })
     name: string;
 
-    @Column({ type: 'int', nullable: true })
-    service_id?: number | null;
-
-    @Column({ type: 'int', nullable: true })
-    sub_service_id?: number | null;
-
-    @Column({ type: 'varchar', length: 50, nullable: true })
-    service_type?: string | null;
-
     @Column({
         type: 'enum',
         enum: TaskType,
@@ -51,18 +42,12 @@ export class WorkflowTask extends BaseModel {
         name: string,
         task_id?: number,
         task_type?: TaskType,
-        category?: CategoryType,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        service_type?: string | null
+        category?: CategoryType
     ) {
         super();
         this.name = name;
         this.task_id = task_id || 0;
         this.task_type = task_type || TaskType.SIMPLE;
         this.category = category || CategoryType.CREATE;
-        this.service_id = service_id ?? null;
-        this.sub_service_id = sub_service_id ?? null;
-        this.service_type = service_type ?? null;
     }
 }

package/src/models/user.ts

@@ -132,7 +132,6 @@ export class User extends BaseModel {
 
     @Column({ nullable: true })
     religion?: string;
-    
     constructor(     
         employee_id?: number,
         civil_employee_id?: number,