@platform-modules/civil-aviation-authority 2.3.92 → 2.3.93

package/.env

@@ -1,20 +1,14 @@
-DB_HOST=164.52.222.169
-DB_PORT=5432 
-DB_USER=postgres_admin_user
-DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
-DB_NAME=CAA
-
-# DB_HOST=216.48.187.46
+# DB_HOST=164.52.222.169
 # DB_PORT=5432 
-# DB_USER=adminuser
-# DB_PASS=postgres_caa_fm_qa_34567
-# DB_NAME=CAA_QA
-
+# DB_USER=postgres_admin_user
+# DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
+# DB_NAME=CAA
 
 
+DB_HOST=localhost
+DB_PORT=5432 
+DB_USER=postgres
+DB_PASS=admin123
+DB_NAME=CAA
 
-# DB_HOST=localhost
-# DB_PORT=5432 
-# DB_USER=postgres
-# DB_PASS=stevejobs
-# DB_NAME=CAA
+TYPEORM_DATABASE_SYNC=true 

package/package.json

@@ -1,24 +1,25 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
-  "version": "2.3.92",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "dev": "ts-node src/scripts.ts"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "moment-timezone": "^0.6.0",
-    "pg": "^8.16.0",
-    "typeorm": "^0.3.17"
-  },
-  "devDependencies": {
-    "@types/moment-timezone": "^0.5.30",
-    "dotenv": "^16.5.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.2.0"
-  }
+ "version": "2.3.93",
+ "main": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "scripts": {
+  "build": "tsc",
+  "dev": "ts-node src/scripts.ts"
+ },
+ "publishConfig": {
+  "access": "public"
+ },
+ "dependencies": {
+  "@platform-modules/civil-aviation-authority": "^2.3.93",
+  "moment-timezone": "^0.6.0",
+  "pg": "^8.16.0",
+  "typeorm": "^0.3.17"
+ },
+ "devDependencies": {
+  "@types/moment-timezone": "^0.5.30",
+  "dotenv": "^16.5.0",
+  "ts-node": "^10.9.2",
+  "typescript": "^5.2.0"
+ }
 }

package/src/data-source.ts

@@ -133,6 +133,11 @@ import { PromotionRequest } from './models/PromotionRequestModel';
 import { AnnualIncrementRequest } from './models/AnnualIncrementRequestModel';
 import { SkillsEnhancementRequest } from './models/SkillsEnhancementRequestModel';
 import { CityMaster } from './models/CityMasterModel';
+import { ResidentialUnitRentalRequest } from './models/ResidentialUnitRentalRequestModel';
+import { ResidentialUnitRentalWorkflow } from './models/ResidentialUnitRentalWorkflowModel';
+import { ResidentialUnitRentalApproval } from './models/ResidentialUnitRentalApprovalModel';
+import { ResidentialUnitRentalChat } from './models/ResidentialUnitRentalChatModel';
+import { ResidentialUnitRentalAttachment } from './models/ResidentialUnitRentalAttachmentModel';
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -267,6 +272,11 @@ export const AppDataSource = new DataSource({
     AnnualIncrementRequest,
     SkillsEnhancementRequest,
     CityMaster,
+    ResidentialUnitRentalRequest,
+    ResidentialUnitRentalWorkflow,
+    ResidentialUnitRentalApproval,
+    ResidentialUnitRentalChat,
+    ResidentialUnitRentalAttachment,
     Document,
     DocumentFolder,
     DocumentType,

package/src/index.ts

@@ -257,4 +257,11 @@ export * from './models/DocumentTypeModel';
 export * from './models/DocumentFolderModel';
 export * from './models/DocumentPermissionModel';
 export * from './models/DocumentAuditLogModel';
-export * from './models/DepartmentDocumentOwnerModel';
+export * from './models/DepartmentDocumentOwnerModel';
+
+// Residential Unit Rental Service
+export * from './models/ResidentialUnitRentalRequestModel';
+export * from './models/ResidentialUnitRentalWorkflowModel';
+export * from './models/ResidentialUnitRentalApprovalModel';
+export * from './models/ResidentialUnitRentalChatModel';
+export * from './models/ResidentialUnitRentalAttachmentModel';

package/src/models/DepartmentsModel.ts

@@ -1,26 +1,26 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-@Entity({ name: 'departments' })
-export class Departments extends BaseModel {
-
-    @Column({ type: 'varchar', length: 64, nullable: false})
-    department_name: string;
-
-    @Column({ type: 'varchar', length: 64, nullable: false})
-    department_code: string;
-
-    @Column({ nullable: false })
-    department_description: string;
-
-    constructor(     
-        department_name: string,
-        department_code: string,
-        department_description: string,
-    ) {
-        super();     
-        this.department_name = department_name
-        this.department_code = department_code
-        this.department_description = department_description
-    }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'departments' })
+export class Departments extends BaseModel {
+
+    @Column({ type: 'varchar', length: 64, nullable: false})
+    department_name: string;
+
+    @Column({ type: 'varchar', length: 64, nullable: false})
+    department_code: string;
+
+    @Column({ nullable: false })
+    department_description: string;
+
+    constructor(     
+        department_name: string,
+        department_code: string,
+        department_description: string,
+    ) {
+        super();     
+        this.department_name = department_name
+        this.department_code = department_code
+        this.department_description = department_description
+    }
 }

package/src/models/ITRequestChatModel.ts

@@ -1,62 +1,62 @@
-import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
-import { BaseModel } from './BaseModel';
-import { ITHelpDeskRequests } from './ITHelpDeskModel';
-import { User } from './user';
-
-@Entity({ name: 'it_request_chat' })
-export class ITRequestChat extends BaseModel {
-
-    @Column({ type: 'integer', nullable: false })
-    request_id: number;
-
-    @ManyToOne(() => ITHelpDeskRequests)
-    @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 })
-    user_id: number;
-
-    @ManyToOne(() => User)
-    @JoinColumn({ name: 'user_id' })
-    user: User;
-
-    @Column({ type: 'integer', nullable: true })
-    role_id: number | null;
-
-    @Column({ type: 'text', nullable: false })
-    message: string;
-
-    @Column({ type: 'text', nullable: true })
-    status: string | null;
-
-    @Column({ type: 'boolean', default: false })
-    is_internal: boolean;
-
-    constructor(
-        request_id: number,
-        user_id: number,
-        message: string,
-        is_internal?: boolean,
-        service_id?: number | null,
-        sub_service_id?: number | null,
-        role_id?: number | null,
-        status?: string | null
-    ) {
-        super();
-        this.request_id = request_id;
-        this.service_id = service_id || null;
-        this.sub_service_id = sub_service_id || null;
-        this.user_id = user_id;
-        this.role_id = role_id || null;
-        this.message = message;
-        this.status = status || null;
-        this.is_internal = is_internal || false;
-    }
-}
-
+import { Column, Entity, ManyToOne, JoinColumn } from "typeorm";
+import { BaseModel } from './BaseModel';
+import { ITHelpDeskRequests } from './ITHelpDeskModel';
+import { User } from './user';
+
+@Entity({ name: 'it_request_chat' })
+export class ITRequestChat extends BaseModel {
+
+    @Column({ type: 'integer', nullable: false })
+    request_id: number;
+
+    @ManyToOne(() => ITHelpDeskRequests)
+    @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 })
+    user_id: number;
+
+    @ManyToOne(() => User)
+    @JoinColumn({ name: 'user_id' })
+    user: User;
+
+    @Column({ type: 'integer', nullable: true })
+    role_id: number | null;
+
+    @Column({ type: 'text', nullable: false })
+    message: string;
+
+    @Column({ type: 'text', nullable: true })
+    status: string | null;
+
+    @Column({ type: 'boolean', default: false })
+    is_internal: boolean;
+
+    constructor(
+        request_id: number,
+        user_id: number,
+        message: string,
+        is_internal?: boolean,
+        service_id?: number | null,
+        sub_service_id?: number | null,
+        role_id?: number | null,
+        status?: string | null
+    ) {
+        super();
+        this.request_id = request_id;
+        this.service_id = service_id || null;
+        this.sub_service_id = sub_service_id || null;
+        this.user_id = user_id;
+        this.role_id = role_id || null;
+        this.message = message;
+        this.status = status || null;
+        this.is_internal = is_internal || false;
+    }
+}
+

package/src/models/ItApprovalsModel.ts

@@ -1,85 +1,85 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-
-export enum ApprovalStatus {
-  PENDING = "Pending",
-  APPROVED = "Approved",
-  REJECTED = "Rejected",
-  ASSIGNED = "Assigned",
-  REASSIGNED = "Reassigned"
-
-}
-
-@Entity({ name: 'it_approvals' })
-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;
-
-  @Column({ type: 'integer', nullable: true })
-  approver_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  delegation_user_id: number | null;
-
-  @Column({ type: 'integer', nullable: false })
-  approver_role_id: number | null;
-
-  @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;
-
-  @Column({ type: 'boolean', default: true, nullable: false })
-  is_allowed: boolean;
-
-    constructor(
-      request_id: number, 
-      approver_user_id: number | null, 
-      approver_role_id: number | null, 
-      comment: string, 
-      approval_status: ApprovalStatus, 
-      level: number,
-      department_id?: number | null,
-      section_id?: number | null,
-      approved_by?: number | null,
-      service_id?: number | null,
-      sub_service_id?: number | null,
-      delegation_user_id?: number | null,
-      is_allowed?: boolean
-    ) {
-    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;
-    this.service_id = service_id ?? null;
-    this.sub_service_id = sub_service_id ?? null;
-    this.delegation_user_id = delegation_user_id || null;
-    this.is_allowed = is_allowed ?? true;
-  }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+
+export enum ApprovalStatus {
+  PENDING = "Pending",
+  APPROVED = "Approved",
+  REJECTED = "Rejected",
+  ASSIGNED = "Assigned",
+  REASSIGNED = "Reassigned"
+
+}
+
+@Entity({ name: 'it_approvals' })
+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;
+
+  @Column({ type: 'integer', nullable: true })
+  approver_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  delegation_user_id: number | null;
+
+  @Column({ type: 'integer', nullable: false })
+  approver_role_id: number | null;
+
+  @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;
+
+  @Column({ type: 'boolean', default: true, nullable: false })
+  is_allowed: boolean;
+
+    constructor(
+      request_id: number, 
+      approver_user_id: number | null, 
+      approver_role_id: number | null, 
+      comment: string, 
+      approval_status: ApprovalStatus, 
+      level: number,
+      department_id?: number | null,
+      section_id?: number | null,
+      approved_by?: number | null,
+      service_id?: number | null,
+      sub_service_id?: number | null,
+      delegation_user_id?: number | null,
+      is_allowed?: boolean
+    ) {
+    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;
+    this.service_id = service_id ?? null;
+    this.sub_service_id = sub_service_id ?? null;
+    this.delegation_user_id = delegation_user_id || null;
+    this.is_allowed = is_allowed ?? true;
+  }
 }

package/src/models/ItWorkflowModel.ts

@@ -1,56 +1,56 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from './BaseModel';
-
-export enum workFlowStatus {
-    COMPLETED = "Completed",
-    NOT_YET_STARTED = "Not Yet Started",
-    PENDING = "Pending"
-  }
-
-//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: 'it_work_flows' })
-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;
-
-  @Column({ type: 'varchar', length: 255, nullable: false })
-  content: string;
-
-  @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
-  status: workFlowStatus;
-
-  @Column({ type: 'integer', nullable: true })
-  user_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  role_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  department_id: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  section_id: number | null;
-
-  constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null, user_id?: number | null, role_id?: number | null, department_id?: number | null, section_id?: number | null) {
-    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;
-    this.user_id = user_id || null;
-    this.role_id = role_id || null;
-    this.department_id = department_id || null;
-    this.section_id = section_id || null;
-  }
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+export enum workFlowStatus {
+    COMPLETED = "Completed",
+    NOT_YET_STARTED = "Not Yet Started",
+    PENDING = "Pending"
+  }
+
+//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: 'it_work_flows' })
+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;
+
+  @Column({ type: 'varchar', length: 255, nullable: false })
+  content: string;
+
+  @Column({ type: 'enum', enum: workFlowStatus, default: workFlowStatus.NOT_YET_STARTED, nullable: false })
+  status: workFlowStatus;
+
+  @Column({ type: 'integer', nullable: true })
+  user_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  role_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  department_id: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  section_id: number | null;
+
+  constructor(request_id: number, content: string, status: workFlowStatus, order?: number, service_id?: number | null, sub_service_id?: number | null, user_id?: number | null, role_id?: number | null, department_id?: number | null, section_id?: number | null) {
+    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;
+    this.user_id = user_id || null;
+    this.role_id = role_id || null;
+    this.department_id = department_id || null;
+    this.section_id = section_id || null;
+  }
 }

package/src/models/MissionTravelPassportExpiryNotificationConfigModel.ts

@@ -1,36 +1,36 @@
-import { Column, Entity } from "typeorm";
-import { BaseModel } from "./BaseModel";
-
-
-@Entity({ name: "mission_travel_passport_expiry_notification_configs" })
-export class MissionTravelPassportExpiryNotificationConfig extends BaseModel {
-  @Column({ type: "integer", nullable: false })
-  department_id: number;
-
-  @Column({ type: "integer", nullable: true })
-  section_id: number | null;
-
-  @Column({ type: "varchar", length: 255, nullable: true })
-  frequency: string | null;
-
-  @Column({ type: "integer", nullable: true })
-  repeat_interval_days: number | null; // Repeating after every N days (default 10)
-
-  @Column({ type: "boolean", nullable: false, default: true })
-  is_active: boolean;
-
-  constructor(
-    department_id: number,
-    section_id: number | null = null,
-    frequency: string | null = null,
-    repeat_interval_days: number = 10,
-    is_active: boolean = true
-  ) {
-    super();
-    this.department_id = department_id;
-    this.section_id = section_id;
-    this.frequency = frequency;
-    this.repeat_interval_days = repeat_interval_days;
-    this.is_active = is_active;
-  }
-}
+import { Column, Entity } from "typeorm";
+import { BaseModel } from "./BaseModel";
+
+
+@Entity({ name: "mission_travel_passport_expiry_notification_configs" })
+export class MissionTravelPassportExpiryNotificationConfig extends BaseModel {
+  @Column({ type: "integer", nullable: false })
+  department_id: number;
+
+  @Column({ type: "integer", nullable: true })
+  section_id: number | null;
+
+  @Column({ type: "varchar", length: 255, nullable: true })
+  frequency: string | null;
+
+  @Column({ type: "integer", nullable: true })
+  repeat_interval_days: number | null; // Repeating after every N days (default 10)
+
+  @Column({ type: "boolean", nullable: false, default: true })
+  is_active: boolean;
+
+  constructor(
+    department_id: number,
+    section_id: number | null = null,
+    frequency: string | null = null,
+    repeat_interval_days: number = 10,
+    is_active: boolean = true
+  ) {
+    super();
+    this.department_id = department_id;
+    this.section_id = section_id;
+    this.frequency = frequency;
+    this.repeat_interval_days = repeat_interval_days;
+    this.is_active = is_active;
+  }
+}