@platform-modules/foreign-ministry 1.3.355 → 1.3.359

package/sql/sla_requests_status_to_varchar.sql

@@ -1,28 +1,28 @@
--- Store sla_requests.status as varchar (not enum) so Assigned / Completed and future values work without enum migrations.
-
-DO $$
-BEGIN
-  IF EXISTS (
-    SELECT 1
-    FROM information_schema.columns
-    WHERE table_schema = 'public'
-      AND table_name = 'sla_requests'
-      AND column_name = 'status'
-      AND udt_name = 'sla_requests_status_enum'
-  ) THEN
-    ALTER TABLE sla_requests
-      ALTER COLUMN status TYPE varchar(64) USING status::text;
-  ELSIF EXISTS (
-    SELECT 1
-    FROM information_schema.columns
-    WHERE table_schema = 'public'
-      AND table_name = 'sla_requests'
-      AND column_name = 'status'
-      AND character_maximum_length IS DISTINCT FROM 64
-  ) THEN
-    ALTER TABLE sla_requests
-      ALTER COLUMN status TYPE varchar(64) USING status::text;
-  END IF;
-END $$;
-
-
+-- Store sla_requests.status as varchar (not enum) so Assigned / Completed and future values work without enum migrations.
+
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND table_name = 'sla_requests'
+      AND column_name = 'status'
+      AND udt_name = 'sla_requests_status_enum'
+  ) THEN
+    ALTER TABLE sla_requests
+      ALTER COLUMN status TYPE varchar(64) USING status::text;
+  ELSIF EXISTS (
+    SELECT 1
+    FROM information_schema.columns
+    WHERE table_schema = 'public'
+      AND table_name = 'sla_requests'
+      AND column_name = 'status'
+      AND character_maximum_length IS DISTINCT FROM 64
+  ) THEN
+    ALTER TABLE sla_requests
+      ALTER COLUMN status TYPE varchar(64) USING status::text;
+  END IF;
+END $$;
+
+

package/sql/vw_sla_approvals.sql

@@ -1,115 +1,115 @@
--- SLA approvals read model: joined display names for approval routing.
-
--- Approver-scope filtering is applied in Reports_Service (TypeORM), not in this view.
-
--- Run once against the EmpPortal PostgreSQL database:
-
---   psql -U <user> -d <database> -f sql/vw_sla_approvals.sql
-
-
-
-DROP VIEW IF EXISTS vw_sla_approvals CASCADE;
-
-
-
-CREATE VIEW vw_sla_approvals AS
-
-SELECT
-
-    sa.id AS sla_approval_id,
-
-    sa.source_approval_id,
-
-    sa.request_id,
-
-    sa.service_id AS service_id,
-
-    sa.sub_service_id AS sub_service_id,
-
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-
-    sa.approver_role_id AS approval_role_id,
-
-    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
-
-    sa.department_id AS approval_department_id,
-
-    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
-
-    sa.section_id AS approval_section_id,
-
-    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
-
-    sa.approval_status::TEXT AS approval_status,
-
-    sr.status::TEXT AS request_status,
-
-    sa.level AS level,
-
-    sa.approver_user_id AS approver_user_id,
-
-    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
-
-    sa.delegate_user_id AS delegate_user_id,
-
-    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
-
-    sa.approved_by AS approved_by,
-
-    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
-
-    sa.comment::TEXT AS comment,
-
-    sa.created_at AS created_at,
-
-    sa.updated_at AS updated_at
-
-FROM sla_approval sa
-
-INNER JOIN sla_requests sr
-
-    ON sr.id = (
-        SELECT MIN(sr2.id)
-        FROM sla_requests sr2
-        WHERE sr2.request_id = sa.request_id
-          AND COALESCE(sr2.is_deleted, false) = false
-          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
-          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
-    )
-
-LEFT JOIN fm_services svc
-
-    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
-
-LEFT JOIN fm_sub_services subsvc
-
-    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-
-LEFT JOIN departments adpt
-
-    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
-
-LEFT JOIN sections asec
-
-    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
-
-LEFT JOIN role ar
-
-    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
-
-LEFT JOIN users au
-
-    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
-
-LEFT JOIN users du
-
-    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
-
-LEFT JOIN users ab
-
-    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
-
-WHERE COALESCE(sa.is_deleted, false) = false;
-
+-- SLA approvals read model: joined display names for approval routing.
+
+-- Approver-scope filtering is applied in Reports_Service (TypeORM), not in this view.
+
+-- Run once against the EmpPortal PostgreSQL database:
+
+--   psql -U <user> -d <database> -f sql/vw_sla_approvals.sql
+
+
+
+DROP VIEW IF EXISTS vw_sla_approvals CASCADE;
+
+
+
+CREATE VIEW vw_sla_approvals AS
+
+SELECT
+
+    sa.id AS sla_approval_id,
+
+    sa.source_approval_id,
+
+    sa.request_id,
+
+    sa.service_id AS service_id,
+
+    sa.sub_service_id AS sub_service_id,
+
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+
+    sa.approver_role_id AS approval_role_id,
+
+    TRIM(COALESCE(ar.name, ''))::TEXT AS approval_role_name,
+
+    sa.department_id AS approval_department_id,
+
+    TRIM(COALESCE(adpt.department_name, ''))::TEXT AS approval_department_name,
+
+    sa.section_id AS approval_section_id,
+
+    TRIM(COALESCE(asec.section_name, ''))::TEXT AS approval_section_name,
+
+    sa.approval_status::TEXT AS approval_status,
+
+    sr.status::TEXT AS request_status,
+
+    sa.level AS level,
+
+    sa.approver_user_id AS approver_user_id,
+
+    TRIM(COALESCE(au.employee_name, ''))::TEXT AS approver_user_name,
+
+    sa.delegate_user_id AS delegate_user_id,
+
+    TRIM(COALESCE(du.employee_name, ''))::TEXT AS delegate_user_name,
+
+    sa.approved_by AS approved_by,
+
+    TRIM(COALESCE(ab.employee_name, ''))::TEXT AS approved_by_name,
+
+    sa.comment::TEXT AS comment,
+
+    sa.created_at AS created_at,
+
+    sa.updated_at AS updated_at
+
+FROM sla_approval sa
+
+INNER JOIN sla_requests sr
+
+    ON sr.id = (
+        SELECT MIN(sr2.id)
+        FROM sla_requests sr2
+        WHERE sr2.request_id = sa.request_id
+          AND COALESCE(sr2.is_deleted, false) = false
+          AND (sa.service_id IS NULL OR sr2.service_id = sa.service_id)
+          AND (sa.sub_service_id IS NULL OR sr2.sub_service_id = sa.sub_service_id)
+    )
+
+LEFT JOIN fm_services svc
+
+    ON svc.id = sa.service_id AND COALESCE(svc.is_deleted, false) = false
+
+LEFT JOIN fm_sub_services subsvc
+
+    ON subsvc.id = sa.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+
+LEFT JOIN departments adpt
+
+    ON adpt.id = sa.department_id AND COALESCE(adpt.is_deleted, false) = false
+
+LEFT JOIN sections asec
+
+    ON asec.id = sa.section_id AND COALESCE(asec.is_deleted, false) = false
+
+LEFT JOIN role ar
+
+    ON ar.id = sa.approver_role_id AND COALESCE(ar.is_deleted, false) = false
+
+LEFT JOIN users au
+
+    ON au.id = sa.approver_user_id AND COALESCE(au.is_deleted, false) = false
+
+LEFT JOIN users du
+
+    ON du.id = sa.delegate_user_id AND COALESCE(du.is_deleted, false) = false
+
+LEFT JOIN users ab
+
+    ON ab.id = sa.approved_by AND COALESCE(ab.is_deleted, false) = false
+
+WHERE COALESCE(sa.is_deleted, false) = false;
+

package/sql/vw_sla_my_requests.sql

@@ -1,60 +1,60 @@
--- SLA "my requests" read model: joined display names + filtered request_obj payload.
--- Applied via: npm run sync:sla-sql (shared_models)
-
-CREATE OR REPLACE VIEW vw_sla_my_requests AS
-SELECT
-    sr.id AS sla_request_id,
-    sr.user_id,
-    sr.service_id AS service_id,
-    sr.sub_service_id AS sub_service_id,
-    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
-    sr.created_at,
-    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
-    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
-    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
-    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
-    sr.status::TEXT AS status,
-    sr.request_id,
-    (
-        COALESCE(sr.request_obj, '{}'::jsonb)
-        - 'id'
-        - 'status'
-        - 'role_id'
-        - 'user_id'
-        - 'createdBy'
-        - 'created_at'
-        - 'updated_by'
-        - 'updated_at'
-        - 'req_user_department_id'
-        - 'workflow_execution_id'
-        - 'department_id'
-        - 'req_user_section_id'
-        - 'service_type_id'
-        - 'service_type'
-        - 'created_by'
-        - 'service_id'
-        - 'sub_service_id'
-        - 'attachments'
-        - 'is_deleted'
-        - 'sla_request'
-        - 'sla_request_id'
-    ) AS request_fields,
-    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
-    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname,
-    TRIM(COALESCE(req_user.employee_arabic_name, ''))::TEXT AS req_user_arabicname
-FROM sla_requests sr
-LEFT JOIN users req_user
-    ON req_user.id = sr.user_id AND COALESCE(req_user.is_deleted, false) = false
-LEFT JOIN users creator
-    ON sr.created_by ~ '^[0-9]+$'
-    AND creator.id = sr.created_by::integer
-    AND COALESCE(creator.is_deleted, false) = false
-LEFT JOIN departments dept
-    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
-LEFT JOIN sections sec
-    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
-LEFT JOIN fm_services svc
-    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
-LEFT JOIN fm_sub_services subsvc
-    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
-WHERE COALESCE(sr.is_deleted, false) = false;
+-- SLA "my requests" read model: joined display names + filtered request_obj payload.
+-- Applied via: npm run sync:sla-sql (shared_models)
+
+CREATE OR REPLACE VIEW vw_sla_my_requests AS
+SELECT
+    sr.id AS sla_request_id,
+    sr.user_id,
+    sr.service_id AS service_id,
+    sr.sub_service_id AS sub_service_id,
+    TRIM(COALESCE(creator.employee_name, ''))::TEXT AS created_by,
+    sr.created_at,
+    TRIM(COALESCE(dept.department_name, ''))::TEXT AS req_user_department_id,
+    TRIM(COALESCE(sec.section_name, ''))::TEXT AS req_user_section_id,
+    TRIM(COALESCE(svc.name, ''))::TEXT AS service_name,
+    TRIM(COALESCE(subsvc.sub_service_name, ''))::TEXT AS sub_service_name,
+    sr.status::TEXT AS status,
+    sr.request_id,
+    (
+        COALESCE(sr.request_obj, '{}'::jsonb)
+        - 'id'
+        - 'status'
+        - 'role_id'
+        - 'user_id'
+        - 'createdBy'
+        - 'created_at'
+        - 'updated_by'
+        - 'updated_at'
+        - 'req_user_department_id'
+        - 'workflow_execution_id'
+        - 'department_id'
+        - 'req_user_section_id'
+        - 'service_type_id'
+        - 'service_type'
+        - 'created_by'
+        - 'service_id'
+        - 'sub_service_id'
+        - 'attachments'
+        - 'is_deleted'
+        - 'sla_request'
+        - 'sla_request_id'
+    ) AS request_fields,
+    TRIM(COALESCE(dept.department_arabic_name, ''))::TEXT AS req_user_department_arabicname,
+    TRIM(COALESCE(sec.section_arabic_name, ''))::TEXT AS req_user_section_arabicname,
+    TRIM(COALESCE(req_user.employee_arabic_name, ''))::TEXT AS req_user_arabicname
+FROM sla_requests sr
+LEFT JOIN users req_user
+    ON req_user.id = sr.user_id AND COALESCE(req_user.is_deleted, false) = false
+LEFT JOIN users creator
+    ON sr.created_by ~ '^[0-9]+$'
+    AND creator.id = sr.created_by::integer
+    AND COALESCE(creator.is_deleted, false) = false
+LEFT JOIN departments dept
+    ON dept.id = sr.req_user_department_id AND COALESCE(dept.is_deleted, false) = false
+LEFT JOIN sections sec
+    ON sec.id = sr.req_user_section_id AND COALESCE(sec.is_deleted, false) = false
+LEFT JOIN fm_services svc
+    ON svc.id = sr.service_id AND COALESCE(svc.is_deleted, false) = false
+LEFT JOIN fm_sub_services subsvc
+    ON subsvc.id = sr.sub_service_id AND COALESCE(subsvc.is_deleted, false) = false
+WHERE COALESCE(sr.is_deleted, false) = false;

package/src/helpers/employee-evaluation-request.utils.ts

@@ -256,3 +256,130 @@ export async function persistEmployeeEvaluationScores(
 
   return { totalScore: requestTotal, averageScore, employeeCount };
 }
+
+/** Sync person_scores/answers on an existing request (draft update or draft promotion). */
+export async function syncEmployeeEvaluationScores(
+  manager: EntityManager,
+  opts: {
+    requestId: number;
+    formId: number;
+    createdBy: string;
+    employees: NormalizedEmployeeSubmission[];
+    validateAnswers?: boolean;
+  }
+): Promise<{ totalScore: number | null; averageScore: number | null; employeeCount: number }> {
+  const { requestId, formId, createdBy, employees, validateAnswers = false } = opts;
+  const payloadUserIds = new Set(employees.map((e) => e.user_id));
+
+  const existingScores = await manager.find(EmployeeEvaluationPersonScore, {
+    where: { request_id: requestId, is_deleted: false },
+  });
+  for (const ps of existingScores) {
+    if (!payloadUserIds.has(ps.user_id)) {
+      await manager.update(
+        EmployeeEvaluationPersonScore,
+        { id: ps.id },
+        { is_deleted: true, updated_by: createdBy }
+      );
+      await manager.update(
+        EmployeeEvaluationAnswers,
+        { request_id: requestId, user_id: ps.user_id, is_deleted: false },
+        { is_deleted: true, updated_by: createdBy }
+      );
+    }
+  }
+
+  for (const emp of employees) {
+    const existingPerson = existingScores.find((p) => p.user_id === emp.user_id);
+    if (existingPerson) {
+      await manager.update(
+        EmployeeEvaluationPersonScore,
+        { id: existingPerson.id },
+        { is_rca: Boolean(emp.is_rca), updated_by: createdBy }
+      );
+      await manager.update(
+        EmployeeEvaluationAnswers,
+        { request_id: requestId, user_id: emp.user_id, is_deleted: false },
+        { is_deleted: true, updated_by: createdBy }
+      );
+    } else {
+      await manager.save(
+        EmployeeEvaluationPersonScore,
+        manager.create(EmployeeEvaluationPersonScore, {
+          request_id: requestId,
+          user_id: emp.user_id,
+          is_rca: Boolean(emp.is_rca),
+          us_feedback: null,
+          total_score: null,
+          created_by: createdBy,
+          is_deleted: false,
+        })
+      );
+    }
+
+    if (emp.answers.length > 0) {
+      let personTotal = 0;
+      for (const ans of emp.answers) {
+        const qMeta = await manager.findOne(EvaluationFormQuestion, {
+          where: { id: ans.question_id, is_deleted: false },
+        });
+        const questionSectionId = qMeta?.form_section_id;
+        if (validateAnswers) {
+          if (!qMeta || questionSectionId == null || questionSectionId !== ans.section_id) {
+            throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+          }
+          if (qMeta.max_score != null && ans.score > qMeta.max_score) {
+            throw new Error(
+              `score ${ans.score} exceeds max_score ${qMeta.max_score} for question ${ans.question_id}`
+            );
+          }
+        } else if (
+          qMeta &&
+          qMeta.form_section_id != null &&
+          qMeta.form_section_id !== ans.section_id
+        ) {
+          throw new Error(`Invalid question ${ans.question_id} for section ${ans.section_id}`);
+        }
+        personTotal += ans.score;
+        await manager.save(
+          EmployeeEvaluationAnswers,
+          manager.create(EmployeeEvaluationAnswers, {
+            request_id: requestId,
+            user_id: emp.user_id,
+            form_id: formId,
+            section_id: ans.section_id,
+            question_id: ans.question_id,
+            score: ans.score,
+            remarks: ans.remarks ?? null,
+            created_by: createdBy,
+            is_deleted: false,
+          })
+        );
+      }
+      await manager.update(
+        EmployeeEvaluationPersonScore,
+        { request_id: requestId, user_id: emp.user_id, is_deleted: false },
+        { total_score: personTotal, updated_by: createdBy }
+      );
+    }
+  }
+
+  const personRows = await manager.find(EmployeeEvaluationPersonScore, {
+    where: { request_id: requestId, is_deleted: false },
+  });
+  const scores = personRows.map((p) => p.total_score ?? 0);
+  const requestTotal = scores.reduce((a, b) => a + b, 0);
+  const average = personRows.length ? requestTotal / personRows.length : 0;
+  await manager.update(EmployeeEvaluationRequests, { id: requestId }, {
+    total_score: personRows.length ? requestTotal : null,
+    average_score: personRows.length ? average : null,
+    employee_count: personRows.length,
+    updated_by: createdBy,
+  });
+
+  return {
+    totalScore: personRows.length ? requestTotal : null,
+    averageScore: personRows.length ? average : null,
+    employeeCount: personRows.length,
+  };
+}