refactor(fria): simplify code from review findings

## Backend
- Bulk INSERT for rights initialization (10 queries -> 1)
- Parallelize rights upserts with Promise.all (10 sequential -> concurrent)
- Extract recomputeAndPersistScore helper, replacing 3 copy-pasted
  blocks across addRiskItem, updateRiskItem, deleteRiskItem
- Parallelize independent queries in updateFria and updateFriaRights
  with Promise.all
- Remove double-read of rights in updateFriaRights (reuse result
  from score computation instead of re-fetching after commit)
- Use FriaStatus and FriaRiskLevel enums instead of raw strings

## Frontend
- Fix stale version history: refetch when currentVersion changes
  instead of caching permanently after first load

Author: gorkem-bwl

Clients/src/presentation/pages/ProjectView/Fria/FriaVersionHistory.tsx

@@ -199,7 +199,6 @@ const FriaVersionHistory = ({ friaId, currentVersion, inline = false }: FriaVers
 
   useEffect(() => {
     if (!inline && !panelOpen) return;
-    if (versions.length > 0) return;
 
     const fetchVersions = async () => {
       setIsLoading(true);
@@ -215,7 +214,7 @@ const FriaVersionHistory = ({ friaId, currentVersion, inline = false }: FriaVers
     };
 
     fetchVersions();
-  }, [inline, panelOpen, friaId, versions.length]);
+  }, [inline, panelOpen, friaId, currentVersion]);
 
   const handleRowToggle = (id: number) => {
     setExpandedRow((prev) => (prev === id ? null : id));

Servers/controllers/fria.ctrl.ts

@@ -1,6 +1,7 @@
 import { Request, Response } from "express";
 import { sequelize } from "../database/db";
 import { QueryTypes } from "sequelize";
+import { FriaStatus } from "../domain.layer/enums/fria-status.enum";
 import { STATUS_CODE } from "../utils/statusCode.utils";
 import { logProcessing, logSuccess, logFailure } from "../utils/logger/logHelper";
 import { appendToAuditLedger } from "../utils/auditLedger.utils";
@@ -29,6 +30,7 @@ import {
   getFriaSnapshotsQuery,
   getFriaSnapshotByVersionQuery,
   computeFriaScore,
+  recomputeAndPersistScore,
 } from "../utils/fria.utils";
 
 const FILE_NAME = "fria.ctrl.ts";
@@ -188,9 +190,11 @@ export async function updateFria(req: Request, res: Response): Promise<Response>
 
     const transaction = await sequelize.transaction();
     try {
-      // Fetch rights and risk items for score computation
-      const rights = await getFriaRightsQuery(existing.id!, organizationId);
-      const riskItems = await getFriaRiskItemsQuery(existing.id!, organizationId);
+      // Fetch rights and risk items in parallel for score computation
+      const [rights, riskItems] = await Promise.all([
+        getFriaRightsQuery(existing.id!, organizationId),
+        getFriaRiskItemsQuery(existing.id!, organizationId),
+      ]);
 
       // Merge user data with fresh scores in a single UPDATE
       const merged = { ...existing, ...data };
@@ -280,16 +284,16 @@ export async function updateFriaRights(req: Request, res: Response): Promise<Res
     try {
       await bulkUpsertFriaRightsQuery(friaId, rights, organizationId, transaction);
 
-      const updatedRights = await getFriaRightsQuery(friaId, organizationId);
-      const riskItems = await getFriaRiskItemsQuery(friaId, organizationId);
+      const [updatedRights, riskItems] = await Promise.all([
+        getFriaRightsQuery(friaId, organizationId),
+        getFriaRiskItemsQuery(friaId, organizationId),
+      ]);
       const scores = computeFriaScore(fria, updatedRights, riskItems);
 
       await updateFriaQuery(friaId, scores, organizationId, userId, transaction);
 
       await transaction.commit();
 
-      const result = await getFriaRightsQuery(friaId, organizationId);
-
       try {
         await appendToAuditLedger({
           organizationId,
@@ -311,7 +315,7 @@ export async function updateFriaRights(req: Request, res: Response): Promise<Res
         organizationId,
       });
 
-      return res.status(200).json(STATUS_CODE[200](result));
+      return res.status(200).json(STATUS_CODE[200](updatedRights));
     } catch (error) {
       await transaction.rollback();
       throw error;
@@ -393,14 +397,7 @@ export async function addRiskItem(req: Request, res: Response): Promise<Response
 
     const item = await addFriaRiskItemQuery(friaId, data, organizationId);
 
-    // Recompute score
-    const fria = await getFriaByIdQuery(friaId, organizationId);
-    if (fria) {
-      const rights = await getFriaRightsQuery(friaId, organizationId);
-      const riskItems = await getFriaRiskItemsQuery(friaId, organizationId);
-      const scores = computeFriaScore(fria, rights, riskItems);
-      await updateFriaQuery(friaId, scores, organizationId, userId);
-    }
+    await recomputeAndPersistScore(friaId, organizationId, userId);
 
     try {
       await appendToAuditLedger({
@@ -466,14 +463,7 @@ export async function updateRiskItem(req: Request, res: Response): Promise<Respo
       return res.status(404).json(STATUS_CODE[404]("Risk item not found"));
     }
 
-    // Recompute score
-    const fria = await getFriaByIdQuery(friaId, organizationId);
-    if (fria) {
-      const rights = await getFriaRightsQuery(friaId, organizationId);
-      const riskItems = await getFriaRiskItemsQuery(friaId, organizationId);
-      const scores = computeFriaScore(fria, rights, riskItems);
-      await updateFriaQuery(friaId, scores, organizationId, userId);
-    }
+    await recomputeAndPersistScore(friaId, organizationId, userId);
 
     await logSuccess({
       eventType: "Update",
@@ -524,14 +514,7 @@ export async function deleteRiskItem(req: Request, res: Response): Promise<Respo
 
     await deleteFriaRiskItemQuery(itemId, organizationId, undefined, friaId);
 
-    // Recompute score
-    const fria = await getFriaByIdQuery(friaId, organizationId);
-    if (fria) {
-      const rights = await getFriaRightsQuery(friaId, organizationId);
-      const riskItems = await getFriaRiskItemsQuery(friaId, organizationId);
-      const scores = computeFriaScore(fria, rights, riskItems);
-      await updateFriaQuery(friaId, scores, organizationId, userId);
-    }
+    await recomputeAndPersistScore(friaId, organizationId, userId);
 
     try {
       await appendToAuditLedger({
@@ -758,7 +741,7 @@ export async function submitFria(req: Request, res: Response): Promise<Response>
 
       await updateFriaQuery(
         friaId,
-        { status: "submitted", version: fria.version + 1 },
+        { status: FriaStatus.SUBMITTED, version: fria.version + 1 },
         organizationId,
         userId,
         transaction

Servers/utils/fria.utils.ts

@@ -1,5 +1,6 @@
 import { sequelize } from "../database/db";
 import { QueryTypes, Transaction } from "sequelize";
+import { FriaRiskLevel } from "../domain.layer/enums/fria-status.enum";
 import {
   IFriaAssessmentJSON,
   IFriaRight,
@@ -191,28 +192,24 @@ export const initializeFriaRightsQuery = async (
   organizationId: number,
   transaction?: Transaction
 ) => {
-  const results = [];
-  for (const r of DEFAULT_RIGHTS) {
-    const query = `
-      INSERT INTO fria_rights (organization_id, fria_id, right_key, right_title, charter_ref, flagged, severity, confidence)
-      VALUES (:organizationId, :friaId, :rightKey, :rightTitle, :charterRef, FALSE, 0, 0)
-      ON CONFLICT (fria_id, right_key) DO NOTHING
-      RETURNING *
-    `;
-    const result = await sequelize.query(query, {
-      type: QueryTypes.INSERT,
-      replacements: {
-        organizationId,
-        friaId,
-        rightKey: r.right_key,
-        rightTitle: r.right_title,
-        charterRef: r.charter_ref,
-      },
-      transaction,
-    });
-    results.push(result);
-  }
-  return results;
+  const valuesClauses = DEFAULT_RIGHTS.map(
+    (_, i) => `(:orgId, :friaId, :rk${i}, :rt${i}, :cr${i}, FALSE, 0, 0)`
+  ).join(", ");
+
+  const replacements: Record<string, unknown> = { orgId: organizationId, friaId };
+  DEFAULT_RIGHTS.forEach((r, i) => {
+    replacements[`rk${i}`] = r.right_key;
+    replacements[`rt${i}`] = r.right_title;
+    replacements[`cr${i}`] = r.charter_ref;
+  });
+
+  return sequelize.query(
+    `INSERT INTO fria_rights (organization_id, fria_id, right_key, right_title, charter_ref, flagged, severity, confidence)
+     VALUES ${valuesClauses}
+     ON CONFLICT (fria_id, right_key) DO NOTHING
+     RETURNING *`,
+    { type: QueryTypes.INSERT, replacements, transaction }
+  );
 };
 
 export const upsertFriaRightQuery = async (
@@ -270,11 +267,9 @@ export const bulkUpsertFriaRightsQuery = async (
   organizationId: number,
   transaction?: Transaction
 ) => {
-  const results = [];
-  for (const right of rightsArray) {
-    const result = await upsertFriaRightQuery(friaId, right, organizationId, transaction);
-    results.push(result);
-  }
+  const results = await Promise.all(
+    rightsArray.map((right) => upsertFriaRightQuery(friaId, right, organizationId, transaction))
+  );
   return results;
 };
 
@@ -568,9 +563,9 @@ export const computeFriaScore = (
   riskScore = Math.min(riskScore, 100);
 
   // Determine level
-  let riskLevel = "Low";
-  if (riskScore >= 60) riskLevel = "High";
-  else if (riskScore >= 30) riskLevel = "Medium";
+  let riskLevel = FriaRiskLevel.LOW as string;
+  if (riskScore >= 60) riskLevel = FriaRiskLevel.HIGH;
+  else if (riskScore >= 30) riskLevel = FriaRiskLevel.MEDIUM;
 
   // Compute completion percentage
   const sectionFields = [
@@ -615,3 +610,22 @@ export const computeFriaScore = (
     rights_flagged: rightsFlagged,
   };
 };
+
+/**
+ * Fetches current FRIA data, recomputes scores, and persists them.
+ * Used after mutations to rights/risk items to keep scores in sync.
+ */
+export const recomputeAndPersistScore = async (
+  friaId: number,
+  organizationId: number,
+  userId: number
+) => {
+  const [fria, rights, riskItems] = await Promise.all([
+    getFriaByIdQuery(friaId, organizationId),
+    getFriaRightsQuery(friaId, organizationId),
+    getFriaRiskItemsQuery(friaId, organizationId),
+  ]);
+  if (!fria) return;
+  const scores = computeFriaScore(fria, rights, riskItems);
+  await updateFriaQuery(friaId, scores, organizationId, userId);
+};