@platform-modules/civil-aviation-authority 2.3.265 → 2.3.266
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env +0 -15
- package/dist/models/AnnualIncrementRequestEmployeeModel.d.ts +2 -1
- package/dist/models/AnnualIncrementRequestEmployeeModel.js +7 -2
- package/dist/models/AnnualIncrementRequestModel.d.ts +2 -1
- package/dist/models/AnnualIncrementRequestModel.js +7 -2
- package/dist/models/SlaApprovalsViewModel.js +47 -47
- package/dist/models/SlaMyRequestsViewModel.js +50 -50
- package/package.json +1 -1
- package/scripts/sync-sla-reports-sql.js +98 -94
- package/sql/README.md +21 -25
- package/sql/sla-reports-sync.manifest.json +7 -7
- package/sql/sla_reports_admin_procedures.sql +283 -283
- package/sql/sla_reports_approvals_workbook.sql +383 -383
- package/sql/sla_reports_procedures.sql +874 -874
- package/sql/vw_sla_approvals.sql +108 -108
- package/sql/vw_sla_my_requests.sql +53 -53
- package/src/data-source.ts +517 -517
- package/src/index.ts +495 -495
- package/src/models/AccessCardRequestModel.ts +135 -135
- package/src/models/AirportEntryPermitModel.ts +276 -276
- package/src/models/AnnualIncrementRequestEmployeeModel.ts +6 -1
- package/src/models/AnnualIncrementRequestModel.ts +6 -1
- package/src/models/AnnualTrainingPlanRequestModel.ts +153 -153
- package/src/models/DepartmentsModel.ts +25 -25
- package/src/models/DocumentDriveModel.ts +28 -28
- package/src/models/DocumentFolderModel.ts +45 -45
- package/src/models/HotelApprovalModel.ts +83 -83
- package/src/models/HousingContractCancelApprovalModel.ts +64 -64
- package/src/models/HousingContractCancelChatModel.ts +56 -56
- package/src/models/HousingContractRenewalApprovalModel.ts +64 -64
- package/src/models/HousingContractRenewalChatModel.ts +59 -59
- package/src/models/ITRequestAttachmentModel.ts +73 -73
- package/src/models/ITRequestChatModel.ts +74 -74
- package/src/models/ItApprovalsModel.ts +84 -84
- package/src/models/ItWorkflowModel.ts +55 -55
- package/src/models/LegalConsultationApprovalModel.ts +65 -65
- package/src/models/MissionTravelPassportExpiryNotificationConfigModel.ts +36 -36
- package/src/models/NotificationModel.ts +89 -89
- package/src/models/ResidentialUnitRentalApprovalModel.ts +143 -143
- package/src/models/ResidentialUnitRentalChatModel.ts +56 -56
- package/src/models/ResidentialUnitRentalRequestModel.ts +218 -218
- package/src/models/ServiceExtensionAfter60ApprovalModel.ts +87 -87
- package/src/models/ServiceSlaApprovalModel.ts +64 -64
- package/src/models/ServicesNotificationConfigModel.ts +55 -55
- package/src/models/SlaApprovalsViewModel.ts +135 -135
- package/src/models/SlaMyRequestsViewModel.ts +170 -170
- package/src/models/SlaRequestModel.ts +65 -65
- package/src/models/StudyLeaveRequestModel.ts +144 -144
- package/src/models/TrainingRequestModel.ts +164 -164
- package/src/models/TrainingRoomBookingRequestModel.ts +142 -142
- package/src/models/TrainingRoomNotificationConfigModel.ts +30 -30
- package/src/models/role.ts +34 -34
- package/src/models/user.ts +233 -233
- package/src/sla/sla-table-sync.service.ts +90 -90
- package/dist/models/DocumentMetadataModel.d.ts +0 -45
- package/dist/models/DocumentMetadataModel.js +0 -171
- package/dist/models/DocumentationDepartmentsModel.d.ts +0 -13
- package/dist/models/DocumentationDepartmentsModel.js +0 -53
- package/dist/models/FolderModel.d.ts +0 -16
- package/dist/models/FolderModel.js +0 -85
- package/dist/models/ImportExportMaterialModels.d.ts +0 -92
- package/dist/models/ImportExportMaterialModels.js +0 -307
- package/dist/models/PermissionModel.d.ts +0 -18
- package/dist/models/PermissionModel.js +0 -68
- package/dist/models/SecurityAccessApprovalModel.d.ts +0 -23
- package/dist/models/SecurityAccessApprovalModel.js +0 -82
- package/dist/models/SecurityAccessAttachmentModel.d.ts +0 -12
- package/dist/models/SecurityAccessAttachmentModel.js +0 -56
- package/dist/models/SecurityAccessChatModel.d.ts +0 -12
- package/dist/models/SecurityAccessChatModel.js +0 -56
- package/dist/models/SecurityAccessRequestModel.d.ts +0 -25
- package/dist/models/SecurityAccessRequestModel.js +0 -80
- package/dist/models/SecurityAccessWorkflowModel.d.ts +0 -24
- package/dist/models/SecurityAccessWorkflowModel.js +0 -84
- package/dist/models/ServiceExtensionAfterAge60Models.d.ts +0 -93
- package/dist/models/ServiceExtensionAfterAge60Models.js +0 -312
- package/dist/models/UUIDBaseModel.d.ts +0 -14
- package/dist/models/UUIDBaseModel.js +0 -66
- package/dist/models/WorkingHoursExtensionModels.d.ts +0 -88
- package/dist/models/WorkingHoursExtensionModels.js +0 -295
package/.env
CHANGED
|
@@ -1,24 +1,9 @@
|
|
|
1
|
-
# DB_HOST=localhost
|
|
2
|
-
# DB_PORT=5432
|
|
3
|
-
# DB_USER=postgres
|
|
4
|
-
# DB_PASS=stevejobs
|
|
5
|
-
# DB_NAME=CAA
|
|
6
|
-
|
|
7
|
-
|
|
8
1
|
DB_HOST=164.52.222.169
|
|
9
2
|
DB_PORT=5432
|
|
10
3
|
DB_USER=postgres_admin_user
|
|
11
4
|
DB_PASS=pg_admin_user_pwd_caa_fa_$%^&OIukhjgcvbn
|
|
12
5
|
DB_NAME=CAA
|
|
13
6
|
|
|
14
|
-
# DB_HOST=216.48.187.46
|
|
15
|
-
# DB_PORT=5432
|
|
16
|
-
# DB_USER=adminuser
|
|
17
|
-
# DB_PASS=postgres_caa_fm_qa_34567
|
|
18
|
-
# DB_NAME=CAA_QA
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
7
|
|
|
23
8
|
# DB_HOST=localhost
|
|
24
9
|
# DB_PORT=5432
|
|
@@ -11,6 +11,7 @@ export declare class AnnualIncrementRequestEmployee extends BaseModel {
|
|
|
11
11
|
current_basic_salary: number | null;
|
|
12
12
|
increment_percentage: number | null;
|
|
13
13
|
new_basic_salary: number | null;
|
|
14
|
+
annual_periodic_allowance: number | null;
|
|
14
15
|
request: AnnualIncrementRequest;
|
|
15
|
-
constructor(request_id: number, employee_name: string, employee_id: string, allowance_year: number, effective_date: Date, service_id?: number | null, sub_service_id?: number | null, current_basic_salary?: number | null, increment_percentage?: number | null, new_basic_salary?: number | null);
|
|
16
|
+
constructor(request_id: number, employee_name: string, employee_id: string, allowance_year: number, effective_date: Date, service_id?: number | null, sub_service_id?: number | null, current_basic_salary?: number | null, increment_percentage?: number | null, new_basic_salary?: number | null, annual_periodic_allowance?: number | null);
|
|
16
17
|
}
|
|
@@ -14,7 +14,7 @@ const typeorm_1 = require("typeorm");
|
|
|
14
14
|
const BaseModel_1 = require("./BaseModel");
|
|
15
15
|
const AnnualIncrementRequestModel_1 = require("./AnnualIncrementRequestModel");
|
|
16
16
|
let AnnualIncrementRequestEmployee = class AnnualIncrementRequestEmployee extends BaseModel_1.BaseModel {
|
|
17
|
-
constructor(request_id, employee_name, employee_id, allowance_year, effective_date, service_id, sub_service_id, current_basic_salary, increment_percentage, new_basic_salary) {
|
|
17
|
+
constructor(request_id, employee_name, employee_id, allowance_year, effective_date, service_id, sub_service_id, current_basic_salary, increment_percentage, new_basic_salary, annual_periodic_allowance) {
|
|
18
18
|
super();
|
|
19
19
|
this.request_id = request_id;
|
|
20
20
|
this.service_id = service_id ?? null;
|
|
@@ -26,6 +26,7 @@ let AnnualIncrementRequestEmployee = class AnnualIncrementRequestEmployee extend
|
|
|
26
26
|
this.current_basic_salary = current_basic_salary ?? null;
|
|
27
27
|
this.increment_percentage = increment_percentage ?? null;
|
|
28
28
|
this.new_basic_salary = new_basic_salary ?? null;
|
|
29
|
+
this.annual_periodic_allowance = annual_periodic_allowance ?? null;
|
|
29
30
|
}
|
|
30
31
|
};
|
|
31
32
|
exports.AnnualIncrementRequestEmployee = AnnualIncrementRequestEmployee;
|
|
@@ -69,6 +70,10 @@ __decorate([
|
|
|
69
70
|
(0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
|
|
70
71
|
__metadata("design:type", Object)
|
|
71
72
|
], AnnualIncrementRequestEmployee.prototype, "new_basic_salary", void 0);
|
|
73
|
+
__decorate([
|
|
74
|
+
(0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
|
|
75
|
+
__metadata("design:type", Object)
|
|
76
|
+
], AnnualIncrementRequestEmployee.prototype, "annual_periodic_allowance", void 0);
|
|
72
77
|
__decorate([
|
|
73
78
|
(0, typeorm_1.ManyToOne)(() => AnnualIncrementRequestModel_1.AnnualIncrementRequest, { onDelete: "CASCADE" }),
|
|
74
79
|
(0, typeorm_1.JoinColumn)({ name: "request_id", referencedColumnName: "id" }),
|
|
@@ -76,5 +81,5 @@ __decorate([
|
|
|
76
81
|
], AnnualIncrementRequestEmployee.prototype, "request", void 0);
|
|
77
82
|
exports.AnnualIncrementRequestEmployee = AnnualIncrementRequestEmployee = __decorate([
|
|
78
83
|
(0, typeorm_1.Entity)({ name: "annual_increment_request_employees" }),
|
|
79
|
-
__metadata("design:paramtypes", [Number, String, String, Number, Date, Object, Object, Object, Object, Object])
|
|
84
|
+
__metadata("design:paramtypes", [Number, String, String, Number, Date, Object, Object, Object, Object, Object, Object])
|
|
80
85
|
], AnnualIncrementRequestEmployee);
|
|
@@ -28,5 +28,6 @@ export declare class AnnualIncrementRequest extends BaseModel {
|
|
|
28
28
|
current_basic_salary: number | null;
|
|
29
29
|
increment_percentage: number | null;
|
|
30
30
|
new_basic_salary: number | null;
|
|
31
|
-
|
|
31
|
+
annual_periodic_allowance: number | null;
|
|
32
|
+
constructor(user_id: number, status?: AnnualIncrementRequestStatus, 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, description?: string | null, reviewer_user_id?: number | null, assigned_to_user_id?: number | null, assigned_at?: Date | null, workflow_execution_id?: string | null, employee_name?: string, employee_id?: string, allowance_year?: number, effective_date?: Date, current_basic_salary?: number | null, increment_percentage?: number | null, new_basic_salary?: number | null, annual_periodic_allowance?: number | null);
|
|
32
33
|
}
|
|
@@ -22,7 +22,7 @@ var AnnualIncrementRequestStatus;
|
|
|
22
22
|
AnnualIncrementRequestStatus["REJECTED"] = "Rejected";
|
|
23
23
|
})(AnnualIncrementRequestStatus || (exports.AnnualIncrementRequestStatus = AnnualIncrementRequestStatus = {}));
|
|
24
24
|
let AnnualIncrementRequest = class AnnualIncrementRequest extends BaseModel_1.BaseModel {
|
|
25
|
-
constructor(user_id, status = AnnualIncrementRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, employee_name, employee_id, allowance_year, effective_date, current_basic_salary, increment_percentage, new_basic_salary) {
|
|
25
|
+
constructor(user_id, status = AnnualIncrementRequestStatus.PENDING, service_id, sub_service_id, req_user_department_id, req_user_section_id, req_user_position_id, description, reviewer_user_id, assigned_to_user_id, assigned_at, workflow_execution_id, employee_name, employee_id, allowance_year, effective_date, current_basic_salary, increment_percentage, new_basic_salary, annual_periodic_allowance) {
|
|
26
26
|
super();
|
|
27
27
|
this.user_id = user_id;
|
|
28
28
|
this.status = status;
|
|
@@ -44,6 +44,7 @@ let AnnualIncrementRequest = class AnnualIncrementRequest extends BaseModel_1.Ba
|
|
|
44
44
|
this.current_basic_salary = current_basic_salary || null;
|
|
45
45
|
this.increment_percentage = increment_percentage || null;
|
|
46
46
|
this.new_basic_salary = new_basic_salary || null;
|
|
47
|
+
this.annual_periodic_allowance = annual_periodic_allowance || null;
|
|
47
48
|
}
|
|
48
49
|
};
|
|
49
50
|
exports.AnnualIncrementRequest = AnnualIncrementRequest;
|
|
@@ -127,7 +128,11 @@ __decorate([
|
|
|
127
128
|
(0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
|
|
128
129
|
__metadata("design:type", Object)
|
|
129
130
|
], AnnualIncrementRequest.prototype, "new_basic_salary", void 0);
|
|
131
|
+
__decorate([
|
|
132
|
+
(0, typeorm_1.Column)({ type: "decimal", precision: 10, scale: 3, nullable: true }),
|
|
133
|
+
__metadata("design:type", Object)
|
|
134
|
+
], AnnualIncrementRequest.prototype, "annual_periodic_allowance", void 0);
|
|
130
135
|
exports.AnnualIncrementRequest = AnnualIncrementRequest = __decorate([
|
|
131
136
|
(0, typeorm_1.Entity)({ name: "annual_increment_requests" }),
|
|
132
|
-
__metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, Number, Date, Object, Object, Object])
|
|
137
|
+
__metadata("design:paramtypes", [Number, String, Object, Object, Object, Object, Object, Object, Object, Object, Object, Object, String, String, Number, Date, Object, Object, Object, Object])
|
|
133
138
|
], AnnualIncrementRequest);
|
|
@@ -11,53 +11,53 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.SlaApprovalsView = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
-
const VW_SLA_APPROVALS_SQL = `
|
|
15
|
-
SELECT
|
|
16
|
-
sa.id AS sla_approval_id,
|
|
17
|
-
sa.source_approval_id,
|
|
18
|
-
sa.request_id,
|
|
19
|
-
sa.service_id AS service_id,
|
|
20
|
-
sa.sub_service_id AS sub_service_id,
|
|
21
|
-
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
22
|
-
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
23
|
-
sa.approver_role_id AS approval_role_id,
|
|
24
|
-
TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
|
|
25
|
-
sa.department_id AS approval_department_id,
|
|
26
|
-
TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
|
|
27
|
-
sa.section_id AS approval_section_id,
|
|
28
|
-
TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
|
|
29
|
-
sa.approval_status::TEXT AS approval_status,
|
|
30
|
-
sr.status::TEXT AS request_status,
|
|
31
|
-
sa.level AS level,
|
|
32
|
-
sa.approver_user_id AS approver_user_id,
|
|
33
|
-
TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
|
|
34
|
-
sa.delegate_user_id AS delegate_user_id,
|
|
35
|
-
TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
|
|
36
|
-
sa.approved_by AS approved_by,
|
|
37
|
-
TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
|
|
38
|
-
sa.comment::TEXT AS comment,
|
|
39
|
-
sa.created_at AS created_at,
|
|
40
|
-
sa.updated_at AS updated_at
|
|
41
|
-
FROM sla_approval sa
|
|
42
|
-
INNER JOIN sla_requests sr
|
|
43
|
-
ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
|
|
44
|
-
LEFT JOIN caa_services svc
|
|
45
|
-
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
46
|
-
LEFT JOIN caa_sub_services subsvc
|
|
47
|
-
ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
48
|
-
LEFT JOIN departments adpt
|
|
49
|
-
ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
|
|
50
|
-
LEFT JOIN sections asec
|
|
51
|
-
ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
|
|
52
|
-
LEFT JOIN role ar
|
|
53
|
-
ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
|
|
54
|
-
LEFT JOIN users au
|
|
55
|
-
ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
|
|
56
|
-
LEFT JOIN users du
|
|
57
|
-
ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
|
|
58
|
-
LEFT JOIN users ab
|
|
59
|
-
ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
|
|
60
|
-
WHERE COALESCE(sa.is_deleted, false) = false
|
|
14
|
+
const VW_SLA_APPROVALS_SQL = `
|
|
15
|
+
SELECT
|
|
16
|
+
sa.id AS sla_approval_id,
|
|
17
|
+
sa.source_approval_id,
|
|
18
|
+
sa.request_id,
|
|
19
|
+
sa.service_id AS service_id,
|
|
20
|
+
sa.sub_service_id AS sub_service_id,
|
|
21
|
+
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
22
|
+
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
23
|
+
sa.approver_role_id AS approval_role_id,
|
|
24
|
+
TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
|
|
25
|
+
sa.department_id AS approval_department_id,
|
|
26
|
+
TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
|
|
27
|
+
sa.section_id AS approval_section_id,
|
|
28
|
+
TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
|
|
29
|
+
sa.approval_status::TEXT AS approval_status,
|
|
30
|
+
sr.status::TEXT AS request_status,
|
|
31
|
+
sa.level AS level,
|
|
32
|
+
sa.approver_user_id AS approver_user_id,
|
|
33
|
+
TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
|
|
34
|
+
sa.delegate_user_id AS delegate_user_id,
|
|
35
|
+
TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
|
|
36
|
+
sa.approved_by AS approved_by,
|
|
37
|
+
TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
|
|
38
|
+
sa.comment::TEXT AS comment,
|
|
39
|
+
sa.created_at AS created_at,
|
|
40
|
+
sa.updated_at AS updated_at
|
|
41
|
+
FROM sla_approval sa
|
|
42
|
+
INNER JOIN sla_requests sr
|
|
43
|
+
ON sr.request_id = sa.request_id AND COALESCE(sr.is_deleted, false) = false
|
|
44
|
+
LEFT JOIN caa_services svc
|
|
45
|
+
ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
46
|
+
LEFT JOIN caa_sub_services subsvc
|
|
47
|
+
ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
48
|
+
LEFT JOIN departments adpt
|
|
49
|
+
ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
|
|
50
|
+
LEFT JOIN sections asec
|
|
51
|
+
ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
|
|
52
|
+
LEFT JOIN role ar
|
|
53
|
+
ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
|
|
54
|
+
LEFT JOIN users au
|
|
55
|
+
ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
|
|
56
|
+
LEFT JOIN users du
|
|
57
|
+
ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
|
|
58
|
+
LEFT JOIN users ab
|
|
59
|
+
ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
|
|
60
|
+
WHERE COALESCE(sa.is_deleted, false) = false
|
|
61
61
|
`;
|
|
62
62
|
/**
|
|
63
63
|
* Read-only view for SLA approvals listings (TypeORM).
|
|
@@ -36,56 +36,56 @@ exports.SLA_MY_REQUESTS_REQUEST_OBJ_EXCLUDED_KEYS = [
|
|
|
36
36
|
"sla_request",
|
|
37
37
|
"sla_request_id",
|
|
38
38
|
];
|
|
39
|
-
const VW_SLA_MY_REQUESTS_SQL = `
|
|
40
|
-
SELECT
|
|
41
|
-
sr.id AS sla_request_id,
|
|
42
|
-
sr.user_id,
|
|
43
|
-
sr.service_id AS service_id,
|
|
44
|
-
sr.sub_service_id AS sub_service_id,
|
|
45
|
-
TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
|
|
46
|
-
sr.created_at,
|
|
47
|
-
TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
|
|
48
|
-
TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
|
|
49
|
-
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
50
|
-
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
51
|
-
sr.status::TEXT AS status,
|
|
52
|
-
sr.request_id,
|
|
53
|
-
(
|
|
54
|
-
COALESCE(sr.request_obj, '{}'::jsonb)
|
|
55
|
-
- 'id'
|
|
56
|
-
- 'status'
|
|
57
|
-
- 'role_id'
|
|
58
|
-
- 'user_id'
|
|
59
|
-
- 'createdBy'
|
|
60
|
-
- 'created_at'
|
|
61
|
-
- 'updated_by'
|
|
62
|
-
- 'updated_at'
|
|
63
|
-
- 'req_user_department_id'
|
|
64
|
-
- 'workflow_execution_id'
|
|
65
|
-
- 'department_id'
|
|
66
|
-
- 'req_user_section_id'
|
|
67
|
-
- 'service_type_id'
|
|
68
|
-
- 'service_type'
|
|
69
|
-
- 'created_by'
|
|
70
|
-
- 'service_id'
|
|
71
|
-
- 'sub_service_id'
|
|
72
|
-
- 'attachments'
|
|
73
|
-
- 'is_deleted'
|
|
74
|
-
- 'sla_request'
|
|
75
|
-
- 'sla_request_id'
|
|
76
|
-
) AS request_fields
|
|
77
|
-
FROM sla_requests sr
|
|
78
|
-
LEFT JOIN users creator
|
|
79
|
-
ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
|
|
80
|
-
LEFT JOIN departments dept
|
|
81
|
-
ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
|
|
82
|
-
LEFT JOIN sections sec
|
|
83
|
-
ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
|
|
84
|
-
LEFT JOIN caa_services svc
|
|
85
|
-
ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
86
|
-
LEFT JOIN caa_sub_services subsvc
|
|
87
|
-
ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
88
|
-
WHERE COALESCE(sr.is_deleted, false) = false
|
|
39
|
+
const VW_SLA_MY_REQUESTS_SQL = `
|
|
40
|
+
SELECT
|
|
41
|
+
sr.id AS sla_request_id,
|
|
42
|
+
sr.user_id,
|
|
43
|
+
sr.service_id AS service_id,
|
|
44
|
+
sr.sub_service_id AS sub_service_id,
|
|
45
|
+
TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
|
|
46
|
+
sr.created_at,
|
|
47
|
+
TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
|
|
48
|
+
TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
|
|
49
|
+
TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
|
|
50
|
+
TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
|
|
51
|
+
sr.status::TEXT AS status,
|
|
52
|
+
sr.request_id,
|
|
53
|
+
(
|
|
54
|
+
COALESCE(sr.request_obj, '{}'::jsonb)
|
|
55
|
+
- 'id'
|
|
56
|
+
- 'status'
|
|
57
|
+
- 'role_id'
|
|
58
|
+
- 'user_id'
|
|
59
|
+
- 'createdBy'
|
|
60
|
+
- 'created_at'
|
|
61
|
+
- 'updated_by'
|
|
62
|
+
- 'updated_at'
|
|
63
|
+
- 'req_user_department_id'
|
|
64
|
+
- 'workflow_execution_id'
|
|
65
|
+
- 'department_id'
|
|
66
|
+
- 'req_user_section_id'
|
|
67
|
+
- 'service_type_id'
|
|
68
|
+
- 'service_type'
|
|
69
|
+
- 'created_by'
|
|
70
|
+
- 'service_id'
|
|
71
|
+
- 'sub_service_id'
|
|
72
|
+
- 'attachments'
|
|
73
|
+
- 'is_deleted'
|
|
74
|
+
- 'sla_request'
|
|
75
|
+
- 'sla_request_id'
|
|
76
|
+
) AS request_fields
|
|
77
|
+
FROM sla_requests sr
|
|
78
|
+
LEFT JOIN users creator
|
|
79
|
+
ON creator.id = sr.created_by AND COALESCE(creator.is_deleted, false) = false
|
|
80
|
+
LEFT JOIN departments dept
|
|
81
|
+
ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
|
|
82
|
+
LEFT JOIN sections sec
|
|
83
|
+
ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
|
|
84
|
+
LEFT JOIN caa_services svc
|
|
85
|
+
ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
|
|
86
|
+
LEFT JOIN caa_sub_services subsvc
|
|
87
|
+
ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
|
|
88
|
+
WHERE COALESCE(sr.is_deleted, false) = false
|
|
89
89
|
`;
|
|
90
90
|
/**
|
|
91
91
|
* Read-only view for SLA "my requests" listings.
|
package/package.json
CHANGED
|
@@ -1,94 +1,98 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Applies SLA report views + stored procedures to PostgreSQL (idempotent CREATE OR REPLACE).
|
|
3
|
-
*
|
|
4
|
-
* Env (shared_models/.env or Reports_Service/.env):
|
|
5
|
-
* DB_HOST / TYPEORM_HOST
|
|
6
|
-
* DB_PORT / TYPEORM_PORT
|
|
7
|
-
* DB_USER / TYPEORM_USERNAME
|
|
8
|
-
* DB_PASS / TYPEORM_PASSWORD
|
|
9
|
-
* DB_NAME / TYPEORM_DATABASE
|
|
10
|
-
*
|
|
11
|
-
* Usage:
|
|
12
|
-
* node scripts/sync-sla-reports-sql.js
|
|
13
|
-
* npm run sync:sla-sql (from shared_models)
|
|
14
|
-
*/
|
|
15
|
-
|
|
16
|
-
const fs = require('fs');
|
|
17
|
-
const path = require('path');
|
|
18
|
-
const { Client } = require('pg');
|
|
19
|
-
|
|
20
|
-
function loadEnvFiles() {
|
|
21
|
-
const dotenv = require('dotenv');
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Applies SLA report views + stored procedures to PostgreSQL (idempotent CREATE OR REPLACE).
|
|
3
|
+
*
|
|
4
|
+
* Env (shared_models/.env or Reports_Service/.env):
|
|
5
|
+
* DB_HOST / TYPEORM_HOST
|
|
6
|
+
* DB_PORT / TYPEORM_PORT
|
|
7
|
+
* DB_USER / TYPEORM_USERNAME
|
|
8
|
+
* DB_PASS / TYPEORM_PASSWORD
|
|
9
|
+
* DB_NAME / TYPEORM_DATABASE
|
|
10
|
+
*
|
|
11
|
+
* Usage:
|
|
12
|
+
* node scripts/sync-sla-reports-sql.js
|
|
13
|
+
* npm run sync:sla-sql (from shared_models)
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
const fs = require('fs');
|
|
17
|
+
const path = require('path');
|
|
18
|
+
const { Client } = require('pg');
|
|
19
|
+
|
|
20
|
+
function loadEnvFiles() {
|
|
21
|
+
const dotenv = require('dotenv');
|
|
22
|
+
const packageRoot = path.resolve(__dirname, '..');
|
|
23
|
+
const cwdEnv = path.join(process.cwd(), '.env');
|
|
24
|
+
const packageEnv = path.join(packageRoot, '.env');
|
|
25
|
+
const reportsEnv = path.resolve(packageRoot, '..', 'Reports_Service', '.env');
|
|
26
|
+
|
|
27
|
+
if (fs.existsSync(cwdEnv)) {
|
|
28
|
+
dotenv.config({ path: cwdEnv });
|
|
29
|
+
}
|
|
30
|
+
if (fs.existsSync(packageEnv)) {
|
|
31
|
+
dotenv.config({ path: packageEnv, override: true });
|
|
32
|
+
}
|
|
33
|
+
if (fs.existsSync(reportsEnv)) {
|
|
34
|
+
dotenv.config({ path: reportsEnv, override: true });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function getDbConfig() {
|
|
39
|
+
const host = (process.env.TYPEORM_HOST || process.env.DB_HOST || '').trim();
|
|
40
|
+
const port = parseInt(process.env.TYPEORM_PORT || process.env.DB_PORT || '5432', 10);
|
|
41
|
+
const user = (process.env.TYPEORM_USERNAME || process.env.DB_USER || '').trim();
|
|
42
|
+
const password = process.env.TYPEORM_PASSWORD || process.env.DB_PASS || '';
|
|
43
|
+
const database = (process.env.TYPEORM_DATABASE || process.env.DB_NAME || '').trim();
|
|
44
|
+
|
|
45
|
+
if (!host || !user || !database) {
|
|
46
|
+
throw new Error(
|
|
47
|
+
'Missing DB config. Set TYPEORM_* in Reports_Service/.env or DB_* in shared_models/.env'
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return { host, port, user, password, database };
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
async function main() {
|
|
55
|
+
const skipSync = process.argv.includes('--skip');
|
|
56
|
+
if (skipSync || process.env.SKIP_SLA_SQL_SYNC === 'true') {
|
|
57
|
+
console.log('[sync-sla-reports-sql] skipped (SKIP_SLA_SQL_SYNC or --skip)');
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
loadEnvFiles();
|
|
62
|
+
const config = getDbConfig();
|
|
63
|
+
const sqlDir = path.join(__dirname, '..', 'sql');
|
|
64
|
+
const manifestPath = path.join(sqlDir, 'sla-reports-sync.manifest.json');
|
|
65
|
+
|
|
66
|
+
if (!fs.existsSync(manifestPath)) {
|
|
67
|
+
throw new Error(`Manifest not found: ${manifestPath}`);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const files = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
|
|
71
|
+
if (!Array.isArray(files) || files.length === 0) {
|
|
72
|
+
throw new Error('sla-reports-sync.manifest.json must be a non-empty array');
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
const client = new Client(config);
|
|
76
|
+
await client.connect();
|
|
77
|
+
console.log(`[sync-sla-reports-sql] connected to ${config.host}/${config.database}`);
|
|
78
|
+
|
|
79
|
+
try {
|
|
80
|
+
for (const file of files) {
|
|
81
|
+
const filePath = path.join(sqlDir, file);
|
|
82
|
+
if (!fs.existsSync(filePath)) {
|
|
83
|
+
throw new Error(`SQL file missing: ${filePath}`);
|
|
84
|
+
}
|
|
85
|
+
const sql = fs.readFileSync(filePath, 'utf8');
|
|
86
|
+
await client.query(sql);
|
|
87
|
+
console.log(`[sync-sla-reports-sql] applied ${file}`);
|
|
88
|
+
}
|
|
89
|
+
console.log('[sync-sla-reports-sql] done');
|
|
90
|
+
} finally {
|
|
91
|
+
await client.end();
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
main().catch((err) => {
|
|
96
|
+
console.error('[sync-sla-reports-sql] failed:', err.message);
|
|
97
|
+
process.exit(1);
|
|
98
|
+
});
|
package/sql/README.md
CHANGED
|
@@ -1,25 +1,21 @@
|
|
|
1
|
-
# SLA reports — database objects
|
|
2
|
-
|
|
3
|
-
Applied in order by `npm run sync:sla-sql` (see `sla-reports-sync.manifest.json`).
|
|
4
|
-
|
|
5
|
-
| File | Description |
|
|
6
|
-
|------|-------------|
|
|
7
|
-
| `vw_sla_my_requests.sql` | My-requests view |
|
|
8
|
-
| `vw_sla_approvals.sql` | Approvals view |
|
|
9
|
-
| `sla_reports_procedures.sql` | User SLA report functions + Excel helpers |
|
|
10
|
-
| `sla_reports_approvals_workbook.sql` | Approvals Excel workbook (Requests + Approvals per sub-service) |
|
|
11
|
-
| `sla_reports_admin_procedures.sql` | Admin SLA report functions (requires procedures file) |
|
|
12
|
-
|
|
13
|
-
From **shared_models
|
|
14
|
-
|
|
15
|
-
```bash
|
|
16
|
-
npm run sync:sla-sql
|
|
17
|
-
```
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
npm run sync:sla-sql
|
|
23
|
-
```
|
|
24
|
-
|
|
25
|
-
`npm run dev` in Reports_Service runs sync automatically before nodemon.
|
|
1
|
+
# SLA reports — database objects
|
|
2
|
+
|
|
3
|
+
Applied in order by `npm run sync:sla-sql` (see `sla-reports-sync.manifest.json`).
|
|
4
|
+
|
|
5
|
+
| File | Description |
|
|
6
|
+
|------|-------------|
|
|
7
|
+
| `vw_sla_my_requests.sql` | My-requests view |
|
|
8
|
+
| `vw_sla_approvals.sql` | Approvals view |
|
|
9
|
+
| `sla_reports_procedures.sql` | User SLA report functions + Excel helpers |
|
|
10
|
+
| `sla_reports_approvals_workbook.sql` | Approvals Excel workbook (Requests + Approvals per sub-service) |
|
|
11
|
+
| `sla_reports_admin_procedures.sql` | Admin SLA report functions (requires procedures file) |
|
|
12
|
+
|
|
13
|
+
From **shared_models** (uses `shared_models/.env`, or `Reports_Service/.env` when present in monorepo):
|
|
14
|
+
|
|
15
|
+
```bash
|
|
16
|
+
cd shared_models && npm run sync:sla-sql
|
|
17
|
+
```
|
|
18
|
+
|
|
19
|
+
Skip sync: `SKIP_SLA_SQL_SYNC=true` or pass `--skip`.
|
|
20
|
+
|
|
21
|
+
Reports_Service does not run SQL sync — apply these objects before using the reports API (local dev, CI, or deployment pipeline).
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
[
|
|
2
|
-
"vw_sla_my_requests.sql",
|
|
3
|
-
"vw_sla_approvals.sql",
|
|
4
|
-
"sla_reports_procedures.sql",
|
|
5
|
-
"sla_reports_approvals_workbook.sql",
|
|
6
|
-
"sla_reports_admin_procedures.sql"
|
|
7
|
-
]
|
|
1
|
+
[
|
|
2
|
+
"vw_sla_my_requests.sql",
|
|
3
|
+
"vw_sla_approvals.sql",
|
|
4
|
+
"sla_reports_procedures.sql",
|
|
5
|
+
"sla_reports_approvals_workbook.sql",
|
|
6
|
+
"sla_reports_admin_procedures.sql"
|
|
7
|
+
]
|