@platform-modules/civil-aviation-authority 1.0.43 → 1.0.44

package/dist/data-source.js

@@ -25,6 +25,7 @@ const WorkflowHierarchy_1 = require("./models/WorkflowHierarchy");
 const WorkflowTaskNames_1 = require("./models/WorkflowTaskNames");
 const DirectorateModel_1 = require("./models/DirectorateModel");
 const PositionModel_1 = require("./models/PositionModel");
+const serviceBookmarksModel_1 = require("./models/serviceBookmarksModel");
 exports.AppDataSource = new typeorm_1.DataSource({
     type: 'postgres',
     host: process.env.DB_HOST || 'localhost',
@@ -34,5 +35,26 @@ exports.AppDataSource = new typeorm_1.DataSource({
     database: process.env.DB_NAME || 'common_models',
     synchronize: true, // auto-create tables (disable in prod)
     logging: false,
-    entities: [user_1.User, user_sessions_1.userSessions, role_1.Role, ITHelpDeskModel_1.ITHelpDeskRequests, ITServicesTypesSalalahModel_1.ITServicesTypesSalalah, ITServicesTypesMuscatModel_1.ITServicesTypesMuscat, CAAServices_1.CAAServices, CAASubServices_1.CAASubServices, ITApprovalSettings_1.ITApprovalSettings, Workflows_1.Workflows, ItApprovalsModel_1.ItApprovalDetails, ItWorkflowModel_1.ItWorkFlow, WorkflowDefinitions_1.WorkflowDefinitions, WorkflowTask_1.WorkflowTask, DepartmentsModel_1.Departments, SectionModel_1.Sections, WorkflowHierarchy_1.WorkflowHierarchy, WorkflowTaskNames_1.WorkflowTaskNames, DirectorateModel_1.Directorate, PositionModel_1.Position],
+    entities: [
+        user_1.User, user_sessions_1.userSessions,
+        role_1.Role,
+        ITHelpDeskModel_1.ITHelpDeskRequests,
+        ITServicesTypesSalalahModel_1.ITServicesTypesSalalah,
+        ITServicesTypesMuscatModel_1.ITServicesTypesMuscat,
+        CAAServices_1.CAAServices,
+        CAASubServices_1.CAASubServices,
+        ITApprovalSettings_1.ITApprovalSettings,
+        Workflows_1.Workflows,
+        ItApprovalsModel_1.ItApprovalDetails,
+        ItWorkflowModel_1.ItWorkFlow,
+        WorkflowDefinitions_1.WorkflowDefinitions,
+        WorkflowTask_1.WorkflowTask,
+        DepartmentsModel_1.Departments,
+        SectionModel_1.Sections,
+        WorkflowHierarchy_1.WorkflowHierarchy,
+        WorkflowTaskNames_1.WorkflowTaskNames,
+        DirectorateModel_1.Directorate,
+        PositionModel_1.Position,
+        serviceBookmarksModel_1.ServiceBookmarks
+    ],
 });

package/dist/index.d.ts

@@ -18,3 +18,4 @@ export * from './models/WorkflowHierarchy';
 export * from './models/WorkflowTaskNames';
 export * from './models/DirectorateModel';
 export * from './models/PositionModel';
+export * from './models/serviceBookmarksModel';

package/dist/index.js

@@ -34,3 +34,4 @@ __exportStar(require("./models/WorkflowHierarchy"), exports);
 __exportStar(require("./models/WorkflowTaskNames"), exports);
 __exportStar(require("./models/DirectorateModel"), exports);
 __exportStar(require("./models/PositionModel"), exports);
+__exportStar(require("./models/serviceBookmarksModel"), exports);

package/dist/models/ITHelpDeskModel.d.ts

@@ -22,6 +22,5 @@ export declare class ITHelpDeskRequests extends BaseModel {
     reporting_manager: number;
     assigned_to: number;
     status: status;
-    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);
+    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);
 }

package/dist/models/ITHelpDeskModel.js

@@ -24,7 +24,7 @@ var status;
     status["REJECTED"] = "Rejected";
 })(status || (exports.status = status = {}));
 let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel {
-    constructor(department, service_type, problem, request_for, description, extn_num, contact_num, request_date, attachment_url, reporting_manager, assigned_to, status, workflow_execution_id) {
+    constructor(department, service_type, problem, request_for, description, extn_num, contact_num, request_date, attachment_url, reporting_manager, assigned_to, status) {
         super();
         this.department = department,
             this.service_type = service_type,
@@ -37,8 +37,7 @@ let ITHelpDeskRequests = class ITHelpDeskRequests extends BaseModel_1.BaseModel
             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.status = status;
     }
 };
 exports.ITHelpDeskRequests = ITHelpDeskRequests;
@@ -104,11 +103,7 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], ITHelpDeskRequests.prototype, "status", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
-    __metadata("design:type", Object)
-], ITHelpDeskRequests.prototype, "workflow_execution_id", void 0);
 exports.ITHelpDeskRequests = ITHelpDeskRequests = __decorate([
     (0, typeorm_1.Entity)({ name: 'IT_Help_Desk_Requests' }),
-    __metadata("design:paramtypes", [String, String, String, String, String, String, String, Date, String, Number, Number, String, String])
+    __metadata("design:paramtypes", [String, String, String, String, String, String, String, Date, String, Number, Number, String])
 ], ITHelpDeskRequests);

package/dist/models/ITServicesTypesModel.d.ts

@@ -0,0 +1,5 @@
+import { BaseModel } from './BaseModel';
+export declare class ITServicesTypes extends BaseModel {
+    name: string;
+    constructor(name: string);
+}

package/dist/models/ITServicesTypesModel.js

@@ -0,0 +1,29 @@
+"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.ITServicesTypes = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ITServicesTypes = class ITServicesTypes extends BaseModel_1.BaseModel {
+    constructor(name) {
+        super();
+        this.name = name;
+    }
+};
+exports.ITServicesTypes = ITServicesTypes;
+__decorate([
+    (0, typeorm_1.Column)({ nullable: false }),
+    __metadata("design:type", String)
+], ITServicesTypes.prototype, "name", void 0);
+exports.ITServicesTypes = ITServicesTypes = __decorate([
+    (0, typeorm_1.Entity)({ name: 'IT_Services_Types' }),
+    __metadata("design:paramtypes", [String])
+], ITServicesTypes);

package/dist/models/ItApprovalsModel.js

@@ -18,6 +18,7 @@ var ApprovalStatus;
     ApprovalStatus["APPROVED"] = "Approved";
     ApprovalStatus["REJECTED"] = "Rejected";
 })(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
+//This model is used to store the store the leave apporval details of the user for the leave request
 let ItApprovalDetails = class ItApprovalDetails extends BaseModel_1.BaseModel {
     constructor(request_id, approver_user_id, approver_role_id, comment, approval_status, level) {
         super();

package/dist/models/WorkflowHierarchy.d.ts

@@ -3,10 +3,9 @@ import { WorkflowDefinitions } from './WorkflowDefinitions';
 export declare class WorkflowHierarchy extends BaseModel {
     workflow_definition_id: number;
     department_id: number;
-    section_id: number;
-    approval_id: number;
+    approval_level_id: number;
     step_order: number;
     is_required: boolean;
     workflow_definition: WorkflowDefinitions;
-    constructor(workflow_definition_id: number, department_id: number, section_id: number, approval_id: number, step_order: number, is_required?: boolean);
+    constructor(workflow_definition_id: number, department_id: number, approval_level_id: number, step_order: number, is_required?: boolean);
 }

package/dist/models/WorkflowHierarchy.js

@@ -14,12 +14,11 @@ const typeorm_1 = require("typeorm");
 const BaseModel_1 = require("./BaseModel");
 const WorkflowDefinitions_1 = require("./WorkflowDefinitions");
 let WorkflowHierarchy = class WorkflowHierarchy extends BaseModel_1.BaseModel {
-    constructor(workflow_definition_id, department_id, section_id, approval_id, step_order, is_required) {
+    constructor(workflow_definition_id, department_id, approval_level_id, step_order, is_required) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
-        this.section_id = section_id;
-        this.approval_id = approval_id;
+        this.approval_level_id = approval_level_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
     }
@@ -30,17 +29,13 @@ __decorate([
     __metadata("design:type", Number)
 ], WorkflowHierarchy.prototype, "workflow_definition_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
 ], WorkflowHierarchy.prototype, "department_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
-    __metadata("design:type", Number)
-], WorkflowHierarchy.prototype, "section_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'integer', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
-], WorkflowHierarchy.prototype, "approval_id", void 0);
+], WorkflowHierarchy.prototype, "approval_level_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'integer', nullable: false }),
     __metadata("design:type", Number)
@@ -57,5 +52,5 @@ __decorate([
 exports.WorkflowHierarchy = WorkflowHierarchy = __decorate([
     (0, typeorm_1.Entity)({ name: 'workflow_hierarchy' }),
     (0, typeorm_1.Unique)(['workflow_definition_id', 'step_order']),
-    __metadata("design:paramtypes", [Number, Number, Number, Number, Number, Boolean])
+    __metadata("design:paramtypes", [Number, Number, Number, Number, Boolean])
 ], WorkflowHierarchy);

package/dist/models/serviceBookmarksModel.d.ts

@@ -0,0 +1,6 @@
+import { BaseModel } from './BaseModel';
+export declare class ServiceBookmarks extends BaseModel {
+    user_id?: number;
+    service_id?: number;
+    constructor(user_id: number, service_id: number);
+}

package/dist/models/serviceBookmarksModel.js

@@ -0,0 +1,34 @@
+"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.ServiceBookmarks = void 0;
+const typeorm_1 = require("typeorm");
+const BaseModel_1 = require("./BaseModel");
+let ServiceBookmarks = class ServiceBookmarks extends BaseModel_1.BaseModel {
+    constructor(user_id, service_id) {
+        super();
+        this.user_id = user_id;
+        this.service_id = service_id;
+    }
+};
+exports.ServiceBookmarks = ServiceBookmarks;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], ServiceBookmarks.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], ServiceBookmarks.prototype, "service_id", void 0);
+exports.ServiceBookmarks = ServiceBookmarks = __decorate([
+    (0, typeorm_1.Entity)({ name: 'service_bookmarks' }),
+    __metadata("design:paramtypes", [Number, Number])
+], ServiceBookmarks);

package/package.json

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

package/src/data-source.ts

@@ -22,6 +22,7 @@ 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';
 
 
 
@@ -34,5 +35,26 @@ 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, ITHelpDeskRequests, ITServicesTypesSalalah, ITServicesTypesMuscat, CAAServices, CAASubServices, ITApprovalSettings, Workflows, ItApprovalDetails, ItWorkFlow, WorkflowDefinitions, WorkflowTask, Departments, Sections, WorkflowHierarchy, WorkflowTaskNames, Directorate, Position],
+  entities: [
+    User,userSessions,
+    Role, 
+    ITHelpDeskRequests, 
+    ITServicesTypesSalalah, 
+    ITServicesTypesMuscat, 
+    CAAServices, 
+    CAASubServices, 
+    ITApprovalSettings, 
+    Workflows, 
+    ItApprovalDetails, 
+    ItWorkFlow, 
+    WorkflowDefinitions, 
+    WorkflowTask, 
+    Departments, 
+    Sections, 
+    WorkflowHierarchy, 
+    WorkflowTaskNames, 
+    Directorate, 
+    Position,
+    ServiceBookmarks
+  ],
 });

package/src/index.ts

@@ -18,3 +18,4 @@ export * from './models/WorkflowHierarchy';
 export * from './models/WorkflowTaskNames';
 export * from './models/DirectorateModel';
 export * from './models/PositionModel';
+export * from './models/serviceBookmarksModel';

package/src/models/ITHelpDeskModel.ts

@@ -62,9 +62,6 @@ export class ITHelpDeskRequests extends BaseModel {
     })
     status: status;
 
-    @Column({ type: "varchar", nullable: true })
-    workflow_execution_id: string | null;
-
     constructor(     
         department: string,
         service_type: string, 
@@ -78,7 +75,6 @@ export class ITHelpDeskRequests extends BaseModel {
         reporting_manager: number,
         assigned_to: number,
         status: status,     
-        workflow_execution_id?: string,
     ) {
         super();     
         this.department = department,
@@ -92,7 +88,6 @@ export class ITHelpDeskRequests extends BaseModel {
         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.status = status
     }
 }

package/src/models/ItApprovalsModel.ts

@@ -8,6 +8,7 @@ export enum ApprovalStatus {
   REJECTED = "Rejected"
 }
 
+//This model is used to store the store the leave apporval details of the user for the leave request
 @Entity({ name: 'it_approvals' })
 export class ItApprovalDetails extends BaseModel {
   @Column({ type: 'int', nullable: false })

package/src/models/WorkflowHierarchy.ts

@@ -9,14 +9,11 @@ export class WorkflowHierarchy extends BaseModel {
     @Column({ type: 'integer', nullable: false })
     workflow_definition_id: number;
 
-    @Column({ type: 'integer', nullable: true })
+    @Column({ type: 'integer', nullable: false })
     department_id: number;
 
-    @Column({ type: 'integer', nullable: true })
-    section_id: number;
-
-    @Column({ type: 'integer', nullable: true })
-    approval_id: number;
+    @Column({ type: 'integer', nullable: false })
+    approval_level_id: number;
 
     @Column({ type: 'integer', nullable: false })
     step_order: number;
@@ -31,16 +28,14 @@ export class WorkflowHierarchy extends BaseModel {
     constructor(
         workflow_definition_id: number,
         department_id: number,
-        section_id: number,
-        approval_id: number,
+        approval_level_id: number,
         step_order: number,
         is_required?: boolean
     ) {
         super();
         this.workflow_definition_id = workflow_definition_id;
         this.department_id = department_id;
-        this.section_id = section_id;
-        this.approval_id = approval_id;
+        this.approval_level_id = approval_level_id;
         this.step_order = step_order;
         this.is_required = is_required !== undefined ? is_required : true;
     }

package/src/models/serviceBookmarksModel.ts

@@ -0,0 +1,21 @@
+import { Column, Entity } from "typeorm";
+import { BaseModel } from './BaseModel';
+
+@Entity({ name: 'service_bookmarks' })
+export class ServiceBookmarks extends BaseModel {
+
+    @Column({ type: 'bigint', nullable: true })
+    user_id?: number;
+
+    @Column({ type: 'bigint', nullable: true })
+    service_id?: number;
+
+    constructor(     
+        user_id: number,
+        service_id: number
+    ) {
+        super();     
+        this.user_id = user_id
+        this.service_id = service_id
+    }
+}