@platform-modules/civil-aviation-authority 2.3.110 → 2.3.120

package/dist/models/DocumentDriveModel.d.ts

@@ -1,14 +1,11 @@
 import { BaseModel } from "./BaseModel";
 import { Departments } from "./DepartmentsModel";
-import { User } from "./user";
 import { DocumentFolder } from "./DocumentFolderModel";
 export declare class DocumentDrive extends BaseModel {
     department_id: number;
-    owner_user_id: number;
     name: string;
     description: string | null;
     is_active: boolean;
     department?: Departments;
-    owner?: User;
     folders?: DocumentFolder[];
 }

package/dist/models/DocumentDriveModel.js

@@ -13,7 +13,6 @@ exports.DocumentDrive = void 0;
 const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 const DepartmentsModel_1 = require("./DepartmentsModel");
-const user_1 = require("./user");
 const DocumentFolderModel_1 = require("./DocumentFolderModel");
 let DocumentDrive = class DocumentDrive extends BaseModel_1.BaseModel {
 };
@@ -22,10 +21,6 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: false }),
     __metadata("design:type", Number)
 ], DocumentDrive.prototype, "department_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "integer", nullable: false }),
-    __metadata("design:type", Number)
-], DocumentDrive.prototype, "owner_user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "varchar", length: 255, nullable: false }),
     __metadata("design:type", String)
@@ -43,11 +38,6 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: "department_id" }),
     __metadata("design:type", DepartmentsModel_1.Departments)
 ], DocumentDrive.prototype, "department", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => user_1.User),
-    (0, typeorm_1.JoinColumn)({ name: "owner_user_id" }),
-    __metadata("design:type", user_1.User)
-], DocumentDrive.prototype, "owner", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(() => DocumentFolderModel_1.DocumentFolder, (folder) => folder.drive),
     __metadata("design:type", Array)

package/dist/models/DocumentModel.d.ts

@@ -1,6 +1,7 @@
 import { BaseModel } from './BaseModel';
 import { Departments } from './DepartmentsModel';
 import { DocumentFolder } from './DocumentFolderModel';
+import { DocumentDrive } from './DocumentDriveModel';
 import { DocumentType } from './DocumentTypeModel';
 import { DocumentPermission } from './DocumentPermissionModel';
 import { DocumentAuditLog } from './DocumentAuditLogModel';
@@ -8,6 +9,7 @@ export declare class Document extends BaseModel {
     title: string;
     department_id: number;
     document_type_id: number;
+    drive_id?: number;
     folder_id?: number;
     mongodb_file_id: string;
     file_name: string;
@@ -19,6 +21,7 @@ export declare class Document extends BaseModel {
     is_active: boolean;
     department?: Departments;
     documentType?: DocumentType;
+    drive?: DocumentDrive;
     folder?: DocumentFolder;
     permissions?: DocumentPermission[];
     auditLogs?: DocumentAuditLog[];

package/dist/models/DocumentModel.js

@@ -14,6 +14,7 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 const DepartmentsModel_1 = require("./DepartmentsModel");
 const DocumentFolderModel_1 = require("./DocumentFolderModel");
+const DocumentDriveModel_1 = require("./DocumentDriveModel");
 const DocumentTypeModel_1 = require("./DocumentTypeModel");
 const DocumentPermissionModel_1 = require("./DocumentPermissionModel");
 const DocumentAuditLogModel_1 = require("./DocumentAuditLogModel");
@@ -32,6 +33,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], Document.prototype, "document_type_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    __metadata("design:type", Number)
+], Document.prototype, "drive_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
     __metadata("design:type", Number)
@@ -78,6 +83,11 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: 'document_type_id' }),
     __metadata("design:type", DocumentTypeModel_1.DocumentType)
 ], Document.prototype, "documentType", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => DocumentDriveModel_1.DocumentDrive, { nullable: true }),
+    (0, typeorm_1.JoinColumn)({ name: 'drive_id' }),
+    __metadata("design:type", DocumentDriveModel_1.DocumentDrive)
+], Document.prototype, "drive", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => DocumentFolderModel_1.DocumentFolder, { nullable: true }),
     (0, typeorm_1.JoinColumn)({ name: 'folder_id' }),

package/dist/models/TrainingRoomBookingRequestModel.d.ts

@@ -29,11 +29,12 @@ export declare class TrainingRoomBookingRequest extends BaseModel {
     network_support_required: boolean;
     meals_required: boolean;
     number_of_attendees: number;
+    name_of_participants: string[] | null;
     remarks: string | null;
     status: TrainingRoomBookingRequestStatus;
     reviewer_user_id: number | null;
     assigned_to_user_id: number | null;
     assigned_at: Date | null;
     workflow_execution_id: string | null;
-    constructor(user_id: number, purpose_of_training: string, date_of_event: Date, start_time: string, end_time: string, room_type: TrainingRoomBookingRoomType, number_of_attendees: number, network_support_required?: boolean, meals_required?: boolean, status?: TrainingRoomBookingRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, remarks?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null);
+    constructor(user_id: number, purpose_of_training: string, date_of_event: Date, start_time: string, end_time: string, room_type: TrainingRoomBookingRoomType, number_of_attendees: number, network_support_required?: boolean, meals_required?: boolean, status?: TrainingRoomBookingRequestStatus, service_id?: number | null, sub_service_id?: number | null, req_user_department_id?: number | null, req_user_section_id?: number | null, req_user_position_id?: number | null, name_of_participants?: string[] | null, remarks?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null);
 }

package/dist/models/TrainingRoomBookingRequestModel.js

@@ -30,7 +30,7 @@ var TrainingRoomBookingRoomType;
     TrainingRoomBookingRoomType["LABORATORY"] = "Laboratory";
 })(TrainingRoomBookingRoomType || (exports.TrainingRoomBookingRoomType = TrainingRoomBookingRoomType = {}));
 let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseModel_1.BaseModel {
-    constructor(user_id, purpose_of_training, date_of_event, start_time, end_time, room_type, number_of_attendees, network_support_required = false, meals_required = false, status = TrainingRoomBookingRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, remarks, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id) {
+    constructor(user_id, purpose_of_training, date_of_event, start_time, end_time, room_type, number_of_attendees, network_support_required = false, meals_required = false, status = TrainingRoomBookingRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, name_of_participants, remarks, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id) {
         super();
         this.user_id = user_id;
         this.purpose_of_training = purpose_of_training;
@@ -47,6 +47,7 @@ let TrainingRoomBookingRequest = class TrainingRoomBookingRequest extends BaseMo
         this.req_user_department_id = req_user_department_id || null;
         this.req_user_section_id = req_user_section_id || null;
         this.req_user_position_id = req_user_position_id || null;
+        this.name_of_participants = name_of_participants ?? null;
         this.remarks = remarks || null;
         this.reviewer_user_id = reviewer_user_id || null;
         this.assigned_to_user_id = assigned_to_user_id || null;
@@ -115,6 +116,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "integer", nullable: false }),
     __metadata("design:type", Number)
 ], TrainingRoomBookingRequest.prototype, "number_of_attendees", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "json", nullable: true }),
+    __metadata("design:type", Object)
+], TrainingRoomBookingRequest.prototype, "name_of_participants", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "text", nullable: true }),
     __metadata("design:type", Object)
@@ -146,5 +151,5 @@ __decorate([
 ], TrainingRoomBookingRequest.prototype, "workflow_execution_id", void 0);
 exports.TrainingRoomBookingRequest = TrainingRoomBookingRequest = __decorate([
     (0, typeorm_1.Entity)({ name: "training_room_booking_requests" }),
-    __metadata("design:paramtypes", [Number, String, Date, String, String, String, Number, Boolean, Boolean, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
+    __metadata("design:paramtypes", [Number, String, Date, String, String, String, Number, Boolean, Boolean, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object])
 ], TrainingRoomBookingRequest);

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@platform-modules/civil-aviation-authority",
- "version": "2.3.110",
+ "version": "2.3.120",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
  "scripts": {

package/src/models/DocumentDriveModel.ts

@@ -1,7 +1,6 @@
 import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
 import { BaseModel } from "./BaseModel";
 import { Departments } from "./DepartmentsModel";
-import { User } from "./user";
 import { DocumentFolder } from "./DocumentFolderModel";
 
 @Entity({ name: "document_drives" })
@@ -9,9 +8,6 @@ export class DocumentDrive extends BaseModel {
   @Column({ type: "integer", nullable: false })
   department_id: number;
 
-  @Column({ type: "integer", nullable: false })
-  owner_user_id: number;
-
   @Column({ type: "varchar", length: 255, nullable: false })
   name: string;
 
@@ -25,10 +21,8 @@ export class DocumentDrive extends BaseModel {
   @JoinColumn({ name: "department_id" })
   department?: Departments;
 
-  @ManyToOne(() => User)
-  @JoinColumn({ name: "owner_user_id" })
-  owner?: User;
-
   @OneToMany(() => DocumentFolder, (folder) => folder.drive)
   folders?: DocumentFolder[];
+
+
 }

package/src/models/DocumentModel.ts

@@ -2,6 +2,7 @@ import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
 import { BaseModel } from './BaseModel';
 import { Departments } from './DepartmentsModel';
 import { DocumentFolder } from './DocumentFolderModel';
+import { DocumentDrive } from './DocumentDriveModel';
 import { DocumentType } from './DocumentTypeModel';
 import { DocumentPermission } from './DocumentPermissionModel';
 import { DocumentAuditLog } from './DocumentAuditLogModel';
@@ -18,6 +19,9 @@ export class Document extends BaseModel {
   @Column({ type: 'integer', nullable: false })
   document_type_id: number;
 
+  @Column({ type: 'integer', nullable: true })
+  drive_id?: number;
+
   @Column({ type: 'integer', nullable: true })
   folder_id?: number;
 
@@ -53,6 +57,10 @@ export class Document extends BaseModel {
   @JoinColumn({ name: 'document_type_id' })
   documentType?: DocumentType;
 
+  @ManyToOne(() => DocumentDrive, { nullable: true })
+  @JoinColumn({ name: 'drive_id' })
+  drive?: DocumentDrive;
+
   @ManyToOne(() => DocumentFolder, { nullable: true })
   @JoinColumn({ name: 'folder_id' })
   folder?: DocumentFolder;

package/src/models/TrainingRoomBookingRequestModel.ts

@@ -66,6 +66,9 @@ export class TrainingRoomBookingRequest extends BaseModel {
   @Column({ type: "integer", nullable: false })
   number_of_attendees: number;
 
+  @Column({ type: "json", nullable: true })
+  name_of_participants: string[] | null;
+
   @Column({ type: "text", nullable: true })
   remarks: string | null;
 
@@ -105,6 +108,7 @@ export class TrainingRoomBookingRequest extends BaseModel {
     req_user_department_id?: number | null,
     req_user_section_id?: number | null,
     req_user_position_id?: number | null,
+    name_of_participants?: string[] | null,
     remarks?: string | null,
     reviewer_user_id?: number | null,
     assigned_to_user_id?: number | null,
@@ -127,6 +131,7 @@ export class TrainingRoomBookingRequest extends BaseModel {
     this.req_user_department_id = req_user_department_id || null;
     this.req_user_section_id = req_user_section_id || null;
     this.req_user_position_id = req_user_position_id || null;
+    this.name_of_participants = name_of_participants ?? null;
     this.remarks = remarks || null;
     this.reviewer_user_id = reviewer_user_id || null;
     this.assigned_to_user_id = assigned_to_user_id || null;