Bed management

Author: linasliyakath

api-gateway/src/app.ts

@@ -4,11 +4,12 @@ import healthRoutes from './routes/health';
 import { patientAuthProxy } from './proxy/patient.auth.proxy';
 import { patientDataProxy } from './proxy/patient.data.proxy';
 import { staffAuthProxy } from './proxy/staff.auth.proxy';
-import staffDataRouter from './routes/staff.data.router';
+// import staffDataRouter from './routes/staff.data.router';
 import { authenticate } from './middlewares/auth.middleware';
 import { requirePatientSelf } from './middlewares/patient.guard';
 import { createProxyMiddleware } from 'http-proxy-middleware';
-
+import { requirePermission } from './middlewares/rbac.middleware';
+import { staffDataProxy } from './proxy/staff.data.proxy';
 const app = express();
 
 app.use(
@@ -39,8 +40,29 @@ app.use(
 );
 // STAFF auth
 app.use('/staff/public', staffAuthProxy);
-app.use('/staff', authenticate, staffDataRouter);
 
+app.use('/staff', authenticate, staffDataProxy);
+
+app.use('/admin', authenticate, staffDataProxy);
+
+app.use(
+  '/admissions',
+  authenticate,
+  (req: any, _res, next) => {
+    if (req.user?.sub) req.headers['x-user-id'] = String(req.user.sub);
+
+    if (req.user?.role) req.headers['x-user-role'] = String(req.user.role);
+
+    if (req.user?.type) req.headers['x-user-type'] = String(req.user.type);
+
+    next();
+  },
+  createProxyMiddleware({
+    target: process.env.PATIENT_SERVICE_URL,
+    changeOrigin: true,
+    pathRewrite: (path) => `/admissions${path}`,
+  })
+);
 //Appointment routes (accessible by PATIENT + STAFF + ADMIN)
 
 app.use(

api-gateway/src/middlewares/rbac.middleware.ts

@@ -1,13 +1,16 @@
 import { Response, NextFunction } from 'express';
 import { AuthenticatedRequest } from './auth.middleware';
 
-// what actions exist in the system
-export type Permission = 'CREATE_STAFF' | 'UPDATE_STAFF' | 'DEACTIVATE_STAFF';
+export type Permission =
+  | 'CREATE_STAFF'
+  | 'UPDATE_STAFF'
+  | 'DEACTIVATE_STAFF'
+  | 'MANAGE_BEDS';
 
-// staff role → permissions
 const STAFF_ROLE_PERMISSIONS: Record<string, Permission[]> = {
   DOCTOR: [],
-  NURSE: [],
+  NURSE: ['MANAGE_BEDS'],
+  RECEPTIONIST: ['MANAGE_BEDS'],
 };
 
 export function requirePermission(permission: Permission) {
@@ -18,12 +21,22 @@ export function requirePermission(permission: Permission) {
       return res.status(401).json({ error: 'Unauthorized' });
     }
 
-    // ✅ ADMIN can do everything
+    // ADMIN can do everything
     if (user.type === 'ADMIN') {
       return next();
     }
 
-    // ❌ STAFF cannot do admin actions
-    return res.status(403).json({ error: 'Forbidden' });
+    // Only STAFF can have role permissions
+    if (user.type !== 'STAFF' || !user.role) {
+      return res.status(403).json({ error: 'Forbidden' });
+    }
+
+    const rolePermissions = STAFF_ROLE_PERMISSIONS[user.role] ?? [];
+
+    if (!rolePermissions.includes(permission)) {
+      return res.status(403).json({ error: 'Forbidden' });
+    }
+
+    next();
   };
 }

api-gateway/src/proxy/staff.data.proxy.ts

@@ -3,7 +3,15 @@ import { createProxyMiddleware } from 'http-proxy-middleware';
 export const staffDataProxy = createProxyMiddleware({
   target: 'http://localhost:3002',
   changeOrigin: true,
+  pathRewrite: (path, req: any) => {
+    if (req.originalUrl.startsWith('/admin')) {
+      return `/admin${path}`;
+    }
 
-  // /staff/* → /staff/*
-  pathRewrite: (path) => `/staff${path}`,
+    if (req.originalUrl.startsWith('/staff')) {
+      return `/staff${path}`;
+    }
+
+    return path;
+  },
 });

api-gateway/src/routes/staff.data.router.ts

@@ -4,10 +4,13 @@ import { staffDataProxy } from '../proxy/staff.data.proxy';
 
 const router = express.Router();
 
-// 🔒 ADMIN ONLY: create staff
+// 🔒 ADMIN ONLY
 router.post('/', requirePermission('CREATE_STAFF'), staffDataProxy);
 
-// everything else just passes through
+// 🔒 BED MANAGEMENT
+router.use('/beds', requirePermission('MANAGE_BEDS'), staffDataProxy);
+
+// everything else
 router.use(staffDataProxy);
 
 export default router;

frontend/src/app/admin/dashboard/page.tsx

@@ -1,17 +1,59 @@
 import CreateStaffForm from "@/src/features/admin/components/CreateStaffForm";
-
+import CreateWardForm from "@/src/features/admin/components/CreateWardForm";
+import CreateRoomForm from "@/src/features/admin/components/CreateRoomForm";
+import CreateBedForm from "@/src/features/admin/components/CreateBedForm";
 
 export default function AdminDashboard() {
   return (
-    <div>
-      <h1 className="text-2xl font-bold">
-        Admin Dashboard
-      </h1>
+    <div className="min-h-screen bg-gray-50 px-4 py-12 sm:px-6">
+      <div className="max-w-4xl mx-auto space-y-12"> {/* Narrower container for better readability */}
+        
+        {/* Page Header */}
+        <header className="border-b pb-6">
+          <h1 className="text-3xl font-bold text-gray-900">Admin Management</h1>
+          <p className="text-gray-500">Add new staff members and hospital infrastructure</p>
+        </header>
+
+        {/* Form 1: Staff */}
+        <section className="bg-white shadow-md border rounded-xl overflow-hidden">
+          <div className="bg-blue-50 px-6 py-4 border-b border-blue-100">
+            <h2 className="text-lg font-bold text-blue-900">1. Staff Registration</h2>
+          </div>
+          <div className="p-8">
+            <CreateStaffForm />
+          </div>
+        </section>
+
+        {/* Form 2: Wards */}
+        <section className="bg-white shadow-md border rounded-xl overflow-hidden">
+          <div className="bg-green-50 px-6 py-4 border-b border-green-100">
+            <h2 className="text-lg font-bold text-green-900">2. Ward Management</h2>
+          </div>
+          <div className="p-8">
+            <CreateWardForm />
+          </div>
+        </section>
+
+        {/* Form 3: Rooms */}
+        <section className="bg-white shadow-md border rounded-xl overflow-hidden">
+          <div className="bg-purple-50 px-6 py-4 border-b border-purple-100">
+            <h2 className="text-lg font-bold text-purple-900">3. Room Assignment</h2>
+          </div>
+          <div className="p-8">
+            <CreateRoomForm />
+          </div>
+        </section>
 
-      <p>Welcome Admin</p>
+        {/* Form 4: Beds */}
+        <section className="bg-white shadow-md border rounded-xl overflow-hidden">
+          <div className="bg-amber-50 px-6 py-4 border-b border-amber-100">
+            <h2 className="text-lg font-bold text-amber-900">4. Bed Setup</h2>
+          </div>
+          <div className="p-8">
+            <CreateBedForm />
+          </div>
+        </section>
 
-      <div className="space-y-8" >
-         <CreateStaffForm />
       </div>
     </div>
   );

frontend/src/app/staff/dashboard/admissions/page.tsx

@@ -0,0 +1,18 @@
+'use client'
+
+import AdmissionQueue from '@/src/features/admissions/components/AdmissionQueue'
+
+export default function StaffAdmissionsPage() {
+
+  return (
+    <div className="min-h-screen bg-gray-50 p-8">
+
+      <h1 className="text-2xl font-semibold mb-6">
+        Admissions
+      </h1>
+
+      <AdmissionQueue />
+
+    </div>
+  )
+}

frontend/src/app/staff/dashboard/beds/page.tsx

@@ -0,0 +1,23 @@
+'use client'
+
+import BedsBoard from '@/src/features/beds/components/BedsBoard'
+import CreateWardForm from '@/src/features/admin/components/CreateWardForm'
+import CreateRoomForm from '@/src/features/admin/components/CreateRoomForm'
+import CreateBedForm from '@/src/features/admin/components/CreateBedForm'
+
+export default function StaffBedsPage() {
+
+  return (
+
+    <div className="min-h-screen p-8 bg-gray-50 space-y-6">
+
+      <h1 className="text-2xl font-semibold">
+        Bed Management
+      </h1>
+
+      <BedsBoard />
+
+    </div>
+
+  )
+}

frontend/src/app/staff/dashboard/discharge/page.tsx

@@ -0,0 +1,14 @@
+import DischargeRequests from "@/src/features/admissions/components/DischargeRequests";
+
+export default function DischargeRequestsPage(){
+    return(
+        <div className=" min-h-screen bg-gray-50 p-8 space-y-8" >
+            <h1 className="text-2xl font-semibold" >
+          Discharge Requests
+            </h1>
+        <div>
+            <DischargeRequests />
+        </div>
+        </div>
+    )
+}

frontend/src/app/staff/dashboard/layout.tsx

@@ -70,6 +70,26 @@ export default function StaffLayout({
               label="Manage Availability"
               active={pathname === '/staff/dashboard/availability'}
             />
+            <SidebarLink
+            href='/staff/dashboard/beds'
+            label='Beds'
+            active={pathname === '/staff/dashboard/beds'}
+            />
+            <SidebarLink
+            href='/staff/dashboard/admissions'
+            label='Admissions'
+            active={pathname === '/staff/dashboard/admissions'}
+            />
+            <SidebarLink
+            href='/staff/dashboard/discharge'
+            label='Discharge'
+            active={pathname === '/staff/dashboard/Discharge'}
+            />
+            <SidebarLink
+            href='/staff/dashboard/patients'
+            label='Patients'
+            active={pathname === '/staff/dashboard/patients'}
+            />
           </nav>
         </div>
 

frontend/src/app/staff/dashboard/page.tsx

@@ -3,6 +3,7 @@
 import { useStaffAuth } from '../../../staff/auth/staff.auth.provider';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
+import Link from 'next/link';
 
 export default function StaffDashboardPage() {
   const { auth, logout } = useStaffAuth();
@@ -48,6 +49,8 @@ export default function StaffDashboardPage() {
         <p><strong>Role:</strong> {auth.staff?.role}</p>
         <p><strong>Job Title:</strong> {auth.staff?.job_title}</p>
       </div>
+
+      
     </div>
   );
 }