added scheduledShiftController in backend; fixed API routes for scheduleController

frontend/src/services/shiftAssignmentService.ts

@@ -1,6 +1,9 @@
 // frontend/src/services/shiftAssignmentService.ts - WEEKLY PATTERN VERSION
 import { ShiftPlan, ScheduledShift } from '../models/ShiftPlan';
 import { Employee, EmployeeAvailability } from '../models/Employee';
+import { authService } from './authService';
+
+const API_BASE_URL = 'http://localhost:3002/api/scheduled-shifts';
 
 export interface AssignmentResult {
   assignments: { [shiftId: string]: string[] };
@@ -15,7 +18,117 @@ export interface WeeklyPattern {
   weekNumber: number;
 }
 
+// Helper function to get auth headers
+const getAuthHeaders = () => {
+  const token = localStorage.getItem('token');
+  return {
+    'Content-Type': 'application/json',
+    ...(token && { 'Authorization': `Bearer ${token}` })
+  };
+};
+
 export class ShiftAssignmentService {
+  async updateScheduledShift(id: string, updates: { assignedEmployees: string[] }): Promise<void> {
+    try {
+      console.log('🔄 Updating scheduled shift via API:', { id, updates });
+      
+      const response = await fetch(`${API_BASE_URL}/${id}`, {
+        method: 'PUT',
+        headers: {
+          'Content-Type': 'application/json',
+          ...authService.getAuthHeaders()
+        },
+        body: JSON.stringify(updates)
+      });
+
+      // First, check if we got any response
+      if (!response.ok) {
+        // Try to get error message from response
+        const responseText = await response.text();
+        console.error('❌ Server response:', responseText);
+        
+        let errorMessage = `HTTP ${response.status}: ${response.statusText}`;
+        
+        // Try to parse as JSON if possible
+        try {
+          const errorData = JSON.parse(responseText);
+          errorMessage = errorData.error || errorMessage;
+        } catch (e) {
+          // If not JSON, use the text as is
+          errorMessage = responseText || errorMessage;
+        }
+        
+        throw new Error(errorMessage);
+      }
+
+      // Try to parse successful response
+      const responseText = await response.text();
+      let result;
+      try {
+        result = responseText ? JSON.parse(responseText) : {};
+      } catch (e) {
+        console.warn('⚠️ Response was not JSON, but request succeeded');
+        result = { message: 'Update successful' };
+      }
+      
+      console.log('✅ Scheduled shift updated successfully:', result);
+      
+    } catch (error) {
+      console.error('❌ Error updating scheduled shift:', error);
+      throw error;
+    }
+  }
+
+  async getScheduledShift(id: string): Promise<any> {
+    try {
+      const response = await fetch(`${API_BASE_URL}/${id}`, {
+        headers: {
+          'Authorization': `Bearer ${localStorage.getItem('token')}`
+        }
+      });
+
+      if (!response.ok) {
+        const responseText = await response.text();
+        let errorMessage = `HTTP ${response.status}: ${response.statusText}`;
+        
+        try {
+          const errorData = JSON.parse(responseText);
+          errorMessage = errorData.error || errorMessage;
+        } catch (e) {
+          errorMessage = responseText || errorMessage;
+        }
+        
+        throw new Error(errorMessage);
+      }
+
+      const responseText = await response.text();
+      return responseText ? JSON.parse(responseText) : {};
+    } catch (error) {
+      console.error('Error fetching scheduled shift:', error);
+      throw error;
+    }
+  }
+
+  // New method to get all scheduled shifts for a plan
+  async getScheduledShiftsForPlan(planId: string): Promise<ScheduledShift[]> {
+    try {
+      const response = await fetch(`${API_BASE_URL}/plan/${planId}`, {
+        headers: {
+          'Authorization': `Bearer ${localStorage.getItem('token')}`
+        }
+      });
+
+      if (!response.ok) {
+        throw new Error(`Failed to fetch scheduled shifts: ${response.status}`);
+      }
+
+      return await response.json();
+    } catch (error) {
+      console.error('Error fetching scheduled shifts for plan:', error);
+      throw error;
+    }
+  }
+
 
   static async assignShifts(
     shiftPlan: ShiftPlan,
@@ -403,4 +516,6 @@ export class ShiftAssignmentService {
     const date = new Date(dateString);
     return date.getDay() === 0 ? 7 : date.getDay();
   }
-}
+}
+
+export const shiftAssignmentService = new ShiftAssignmentService();

frontend/src/services/shiftPlanService.ts

@@ -186,105 +186,4 @@ export const shiftPlanService = {
       description: preset.description
     }));
   },
-
-  async updateScheduledShift(id: string, updates: { assignedEmployees: string[] }): Promise<void> {
-    try {
-      console.log('🔄 Updating scheduled shift via API:', { id, updates });
-      
-      const response = await fetch(`/api/scheduled-shifts/${id}`, {
-        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': `Bearer ${localStorage.getItem('token')}`
-        },
-        body: JSON.stringify(updates)
-      });
-
-      // First, check if we got any response
-      if (!response.ok) {
-        // Try to get error message from response
-        const responseText = await response.text();
-        console.error('❌ Server response:', responseText);
-        
-        let errorMessage = `HTTP ${response.status}: ${response.statusText}`;
-        
-        // Try to parse as JSON if possible
-        try {
-          const errorData = JSON.parse(responseText);
-          errorMessage = errorData.error || errorMessage;
-        } catch (e) {
-          // If not JSON, use the text as is
-          errorMessage = responseText || errorMessage;
-        }
-        
-        throw new Error(errorMessage);
-      }
-
-      // Try to parse successful response
-      const responseText = await response.text();
-      let result;
-      try {
-        result = responseText ? JSON.parse(responseText) : {};
-      } catch (e) {
-        console.warn('⚠️ Response was not JSON, but request succeeded');
-        result = { message: 'Update successful' };
-      }
-      
-      console.log('✅ Scheduled shift updated successfully:', result);
-      
-    } catch (error) {
-      console.error('❌ Error updating scheduled shift:', error);
-      throw error;
-    }
-  },
-
-  async getScheduledShift(id: string): Promise<any> {
-    try {
-      const response = await fetch(`/api/scheduled-shifts/${id}`, {
-        headers: {
-          'Authorization': `Bearer ${localStorage.getItem('token')}`
-        }
-      });
-
-      if (!response.ok) {
-        const responseText = await response.text();
-        let errorMessage = `HTTP ${response.status}: ${response.statusText}`;
-        
-        try {
-          const errorData = JSON.parse(responseText);
-          errorMessage = errorData.error || errorMessage;
-        } catch (e) {
-          errorMessage = responseText || errorMessage;
-        }
-        
-        throw new Error(errorMessage);
-      }
-
-      const responseText = await response.text();
-      return responseText ? JSON.parse(responseText) : {};
-    } catch (error) {
-      console.error('Error fetching scheduled shift:', error);
-      throw error;
-    }
-  },
-
-  // New method to get all scheduled shifts for a plan
-  async getScheduledShiftsForPlan(planId: string): Promise<ScheduledShift[]> {
-    try {
-      const response = await fetch(`/api/scheduled-shifts/plan/${planId}`, {
-        headers: {
-          'Authorization': `Bearer ${localStorage.getItem('token')}`
-        }
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to fetch scheduled shifts: ${response.status}`);
-      }
-
-      return await response.json();
-    } catch (error) {
-      console.error('Error fetching scheduled shifts for plan:', error);
-      throw error;
-    }
-  }
 };