Merge pull request #2203 from bluewave-labs/hp-sep-23-fix-project-delete-bug

Fix project delete bug

Author: MuhammadKhalilzadeh

Servers/controllers/user.ctrl.ts

@@ -48,7 +48,6 @@ async function getAllUsers(req: Request, res: Response): Promise<any> {
 
     if (users && users.length > 0) {
       logStructured('successful', `found ${users.length} users`, 'getAllUsers', 'user.ctrl.ts');
-      console.log('✅ Sending successful response with users:', users.map((user) => user.toSafeJSON()));
       return res
         .status(200)
         .json(STATUS_CODE[200](users.map((user) => user.toSafeJSON())));

Servers/infrastructure.layer/driver/autoDriver.driver.ts

@@ -168,6 +168,8 @@ export async function insertMockData(
           risk_approval: users[1].id!,
           approval_status: "In Progress",
           date_of_assessment: new Date(Date.now()),
+          projects: [project.id!],
+          frameworks: [2, 3], // ISO frameworks
         },
         tenant,
         transaction

Servers/utils/project.utils.ts

@@ -304,7 +304,7 @@ export const updateProjectUpdatedByIdQuery = async (
   byTable:
     | "controls"
     | "answers"
-    | "projectrisks"
+    // | "projectrisks"
     | "vendors"
     | "subclauses"
     | "annexcategories"
@@ -316,9 +316,9 @@ export const updateProjectUpdatedByIdQuery = async (
   const queryMap = {
     controls: `SELECT pf.project_id as id FROM "${tenant}".controls_eu c JOIN "${tenant}".projects_frameworks pf ON pf.id = c.projects_frameworks_id WHERE c.id = :id;`,
     answers: `SELECT pf.project_id as id FROM "${tenant}".assessments a JOIN "${tenant}".answers_eu ans ON ans.assessment_id = a.id JOIN "${tenant}".projects_frameworks pf ON pf.id = a.projects_frameworks_id WHERE ans.id = :id;`,
-    projectrisks: `SELECT p.id FROM
-      "${tenant}".projects p JOIN "${tenant}".projectrisks pr ON p.id = pr.project_id
-        WHERE pr.id = :id;`,
+    // projectrisks: `SELECT p.id FROM
+    //   "${tenant}".projects p JOIN "${tenant}".projectrisks pr ON p.id = pr.project_id
+    //     WHERE pr.id = :id;`,
     vendors: `SELECT project_id as id FROM "${tenant}".vendors_projects WHERE vendor_id = :id;`,
     subclauses: `SELECT pf.project_id as id FROM "${tenant}".subclauses_iso sc JOIN "${tenant}".projects_frameworks pf ON pf.id = sc.projects_frameworks_id WHERE sc.id = :id;`,
     annexcategories: `SELECT pf.project_id as id FROM "${tenant}".annexcategories_iso a JOIN "${tenant}".projects_frameworks pf ON pf.id = a.projects_frameworks_id WHERE a.id = :id;`,
@@ -480,7 +480,8 @@ export const deleteHelper = async (
   let childIds: any = {};
   if (
     childTableName !== "projects_members" &&
-    childTableName !== "projects_frameworks"
+    childTableName !== "projects_frameworks" &&
+    childTableName !== "projects_risks"
   ) {
     if (childTableName === "vendors") {
       childIds = await sequelize.query(
@@ -555,7 +556,7 @@ export const deleteProjectByIdQuery = async (
       },
     },
     { files: { foreignKey: "project_id", model: FileModel } },
-    { projectrisks: { foreignKey: "project_id", model: RiskModel } },
+    { projects_risks: { foreignKey: "project_id", model: RiskModel } },
     {
       projects_members: {
         foreignKey: "project_id",
@@ -604,7 +605,7 @@ export const calculateProjectRisks = async (
     risk_level_autocalculated: string;
     count: string;
   }>(
-    `SELECT risk_level_autocalculated, count(*) AS count FROM "${tenant}".projectrisks WHERE project_id = :project_id GROUP BY risk_level_autocalculated`,
+    `SELECT risk_level_autocalculated, count(*) AS count FROM "${tenant}".risks r JOIN "${tenant}".projects_risks pr ON r.id = pr.risk_id WHERE pr.project_id = :project_id GROUP BY risk_level_autocalculated`,
     {
       replacements: { project_id },
       type: QueryTypes.SELECT,

Servers/utils/reporting.utils.ts

@@ -23,10 +23,12 @@ import { IProjectsMembers } from "../domain.layer/interfaces/i.projectMember";
 export const getProjectRisksReportQuery = async (projectId: number, tenant: string) => {
   const query = `
     SELECT 
-      risk.*,       
+      risk.*,   
+      pr.project_id AS project_id,
       u.name AS risk_owner_name,
       u.surname AS risk_owner_surname
-    FROM "${tenant}".projectrisks risk
+    FROM "${tenant}".risks risk
+    JOIN "${tenant}".projects_risks pr ON risk.id = pr.risk_id
     LEFT JOIN public.users u ON risk.risk_owner = u.id
     WHERE project_id = :project_id 
     ORDER BY created_at DESC, id ASC

Servers/utils/user.utils.ts

@@ -330,7 +330,7 @@ export const deleteUserByIdQuery = async (
     //   fields: ["approver", "owner", "reviewer"],
     // },
     {
-      table: "projectrisks",
+      table: "risks",
       model: RiskModel,
       fields: ["risk_owner", "risk_approval"],
     },