Phase 5 frontend

backend/.env.example

@@ -1,5 +1,5 @@
 NODE_ENV=development
-PORT=3000
+PORT=5000
 FRONTEND_URL=http://localhost:5173
 JWT_SECRET=change_me
 DATABASE_URL=DATABASE_URL=postgresql://postgres.[project-ref]:[password]@aws-1-ap-south-1.pooler.supabase.com:5432/postgres

backend/src/middleware/errorHandler.js

@@ -2,7 +2,10 @@
 
 export const errorHandler = (err, _req, res, _next) => {
   if (err instanceof ApiError) {
-    return res.status(err.statusCode).json({ message: err.message, details: err.details });
+    return res
+      .status(err.statusCode)
+      .json({ message: err.message, details: err.details });
   }
+  console.error(err);
   return res.status(500).json({ message: "Internal server error" });
 };

backend/src/modules/approvalRules/approvalRules.controller.js

@@ -0,0 +1,39 @@
+import { asyncHandler } from "../../utils/asyncHandler.js";
+import { approvalRulesModel } from "./approvalRules.model.js";
+
+const VALID_TYPES = ["sequential", "percentage", "hybrid"];
+
+export const getCurrentRule = asyncHandler(async (req, res) => {
+  const companyId = req.user.companyId;
+  const result = await approvalRulesModel.getLatestByCompany(companyId);
+
+  if (!result.rows[0]) {
+    return res.status(404).json({ message: "No approval rule configured" });
+  }
+
+  res.json(result.rows[0]);
+});
+
+export const getRuleHistory = asyncHandler(async (req, res) => {
+  const companyId = req.user.companyId;
+  const result = await approvalRulesModel.getHistoryByCompany(companyId);
+  res.json(result.rows);
+});
+
+export const saveRule = asyncHandler(async (req, res) => {
+  const companyId = req.user.companyId;
+  const { type, config } = req.body;
+
+  if (!VALID_TYPES.includes(type)) {
+    return res.status(400).json({
+      message: `type must be one of: ${VALID_TYPES.join(", ")}`,
+    });
+  }
+
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    return res.status(400).json({ message: "config must be an object" });
+  }
+
+  const result = await approvalRulesModel.create({ companyId, type, config });
+  res.status(201).json(result.rows[0]);
+});

backend/src/modules/approvalRules/approvalRules.model.js

@@ -0,0 +1,33 @@
+import { query } from "../../config/db.js";
+
+export const approvalRulesModel = {
+  async getLatestByCompany(companyId) {
+    return query(
+      `SELECT id, company_id, type, config, created_at
+       FROM approval_rules
+       WHERE company_id = $1
+       ORDER BY created_at DESC
+       LIMIT 1`,
+      [companyId],
+    );
+  },
+
+  async getHistoryByCompany(companyId) {
+    return query(
+      `SELECT id, company_id, type, config, created_at
+       FROM approval_rules
+       WHERE company_id = $1
+       ORDER BY created_at DESC`,
+      [companyId],
+    );
+  },
+
+  async create({ companyId, type, config }) {
+    return query(
+      `INSERT INTO approval_rules (company_id, type, config)
+       VALUES ($1, $2, $3)
+       RETURNING id, company_id, type, config, created_at`,
+      [companyId, type, config],
+    );
+  },
+};

backend/src/modules/approvalRules/approvalRules.routes.js

@@ -0,0 +1,17 @@
+import { Router } from "express";
+import { authenticate } from "../../middleware/authenticate.js";
+import { authorize } from "../../middleware/authorize.js";
+import {
+  getCurrentRule,
+  getRuleHistory,
+  saveRule,
+} from "./approvalRules.controller.js";
+
+const router = Router();
+router.use(authenticate);
+
+router.get("/", authorize("admin"), getCurrentRule);
+router.get("/history", authorize("admin"), getRuleHistory);
+router.put("/", authorize("admin"), saveRule);
+
+export default router;

backend/src/routes/index.js

@@ -5,12 +5,14 @@ import companyRoutes from "../modules/companies/companies.routes.js";
 import expenseRoutes from "../modules/expenses/expenses.routes.js";
 import analyticsRoutes from "../modules/analytics/analytics.routes.js";
 import notificationRoutes from "../modules/notifications/notifications.routes.js";
+import approvalRulesRoutes from "../modules/approvalRules/approvalRules.routes.js";
 
 //these are routes
 
 const router = Router();
 router.use("/auth", authRoutes);
 router.use("/users", userRoutes);
+router.use("/approval-rules", approvalRulesRoutes);
 router.use("/companies", companyRoutes);
 router.use("/expenses", expenseRoutes);
 router.use("/analytics", analyticsRoutes);

frontend/.env.example

@@ -1,3 +1,3 @@
-VITE_API_URL=http://localhost:3000/api
-VITE_API_BASE_URL=http://localhost:3000/api
-VITE_SOCKET_URL=http://localhost:3000
+VITE_API_URL=http://localhost:5000/api
+VITE_API_BASE_URL=http://localhost:5000/api
+VITE_SOCKET_URL=http://localhost:5000

frontend/src/api/approvalService.js

@@ -1,11 +1,16 @@
 import api from "./axios";
 
 export async function getPending() {
-    const { data } = await api.get("/expenses/pending");
-    return data?.data || [];
+  const { data } = await api.get("/expenses/pending");
+  return data?.data || [];
 }
 
-export async function saveWorkflowRules(payload) {
-    const { data } = await api.put("/workflows/rules", payload);
-    return data?.rule || data;
+export async function getApprovalRules() {
+  const { data } = await api.get("/approval-rules");
+  return data;
+}
+
+export async function saveApprovalRules(payload) {
+  const { data } = await api.put("/approval-rules", payload);
+  return data;
 }