Add tests for MainLayout and utility functions for API response handling

- Implement tests for MainLayout to verify rendering based on authentication state and route.
- Create utility functions `extractList` and `extractPagination` for handling API responses.
- Set up testing environment with necessary imports for testing-library and vitest.

Author: Dave-code-creater

package-lock.json

@@ -9,6 +9,7 @@
     "build": "vite build",
     "lint": "eslint . --fix",
     "lint:check": "eslint .",
+    "test": "vitest",
     "preview": "vite preview",
     "electron": "electron .",
     "electron:dev": "concurrently \"npm run dev\" \"wait-on http://localhost:5173 && NODE_ENV=development electron .\"",
@@ -74,6 +75,8 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.1.0",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
     "@vitejs/plugin-react": "^4.3.4",
@@ -84,8 +87,10 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
     "globals": "^16.0.0",
+    "jsdom": "^24.1.0",
     "tailwindcss": "^3.4.17",
-    "vite": "^6.3.1"
+    "vite": "^6.3.1",
+    "vitest": "^1.6.1"
   },
   "build": {
     "appId": "com.chiropractor.app",

package.json

@@ -37,7 +37,6 @@ export {
   useCreateTreatmentPlanMutation,
   useGetPatientIncidentsQuery,
   useGetIncidentDetailsQuery,
-  useGetDoctorPatientsQuery,
 } from './services/clinicalNotes';
 
 export {
@@ -51,6 +50,13 @@ export {
   useGetScheduleStatisticsQuery,
 } from './services/doctorScheduleApi';
 
+export {
+  doctorApi,
+  useGetDoctorPatientsQuery,
+  useGetPatientDetailsForDoctorQuery,
+  useGetDoctorStatsQuery,
+} from './services/doctorApi';
+
 // Report/Incident API exports
 export {
   reportApi,

src/api/index.js

@@ -3,6 +3,27 @@ import { baseQueryWithReauth, CACHE_TIMES } from "../core/baseApi";
 import { setCredentials, logOut, updateUserProfile } from "../../state/data/authSlice";
 import { startPeriodicTokenCheck, stopPeriodicTokenCheck, setLoggingOut } from "../core/tokenManager";
 
+const normalizeAuthResponse = (response) => {
+  if (!response) return {};
+
+  const container = response.data ?? response;
+
+  const user = container.user ?? container.profile ?? container.patient ?? null;
+  const tokens = container.tokens ?? {
+    accessToken: container.accessToken ?? response.accessToken ?? response.token ?? null,
+    refreshToken: container.refreshToken ?? response.refreshToken ?? null,
+  };
+
+  return {
+    success: response.success ?? container.success ?? null,
+    message: response.message ?? container.message ?? null,
+    user,
+    tokens,
+    profile: container.profile ?? container.patient ?? null,
+    raw: response,
+  };
+};
+
 export const authApi = createApi({
   reducerPath: "authApi",
   baseQuery: baseQueryWithReauth,
@@ -18,27 +39,42 @@ export const authApi = createApi({
         method: "POST",
         body: credentials,
       }),
+      transformResponse: (response) => normalizeAuthResponse(response),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         try {
           const { data } = await queryFulfilled;
-          dispatch(setCredentials(data));
+
+          if (!data?.user) {
+            console.error("normalizeAuthResponse returned no user", data);
+            return;
+          }
+
+          dispatch(
+            setCredentials({
+              user: data.user,
+              accessToken: data.tokens?.accessToken ?? data.token ?? null,
+              refreshToken: data.tokens?.refreshToken ?? null,
+            })
+          );
 
           // Start periodic token checking after successful login
           startPeriodicTokenCheck({ dispatch, getState });
 
           // Update user profile if additional data is available
-          if (data.user) {
+          const profileSource = data.profile ?? data.user;
+
+          if (profileSource) {
             dispatch(updateUserProfile({
-              firstName: data.user.first_name,
-              lastName: data.user.last_name,
-              fullName: data.user.full_name,
-              phoneNumber: data.user.phone_number,
-              dateOfBirth: data.user.date_of_birth,
-              gender: data.user.gender,
-              marriageStatus: data.user.marriage_status,
-              race: data.user.race,
-              isVerified: data.user.is_verified,
-              phoneVerified: data.user.phone_verified,
+              firstName: profileSource.first_name,
+              lastName: profileSource.last_name,
+              fullName: profileSource.full_name,
+              phoneNumber: profileSource.phone_number,
+              dateOfBirth: profileSource.date_of_birth,
+              gender: profileSource.gender,
+              marriageStatus: profileSource.marriage_status,
+              race: profileSource.race,
+              isVerified: profileSource.is_verified,
+              phoneVerified: profileSource.phone_verified,
             }));
           }
         } catch (error) {

src/api/services/authApi.js

@@ -10,9 +10,6 @@ export const chatApi = createApi({
   refetchOnFocus: false,            // Prevent automatic refetch on window focus
   refetchOnReconnect: true,         // Keep this for actual network issues
   endpoints: (builder) => ({
-    // ===============================================
-    // CONVERSATION ROUTES
-    // ===============================================
 
     // Create a new conversation
     createConversation: builder.mutation({
@@ -124,9 +121,6 @@ export const chatApi = createApi({
       invalidatesTags: ["Conversations"],
     }),
 
-    // ===============================================
-    // MESSAGE ROUTES
-    // ===============================================
 
     // Get messages for a conversation (fallback for initial load)
     getMessages: builder.query({
@@ -177,9 +171,6 @@ export const chatApi = createApi({
       ],
     }),
 
-    // ===============================================
-    // LONG-POLLING AND REAL-TIME MESSAGING
-    // ===============================================
 
     // Long-polling endpoint to get new messages (replaces regular GET messages)
     pollForNewMessages: builder.query({
@@ -221,9 +212,6 @@ export const chatApi = createApi({
       keepUnusedDataFor: 30,
     }),
 
-    // ===============================================
-    // LEGACY USER ROUTES
-    // ===============================================
 
     // Get available users (legacy endpoint)
     getAvailableUsers: builder.query({

src/api/services/chatApi.js

@@ -10,7 +10,6 @@ export const reportApi = createApi({
   refetchOnFocus: false,            // Prevent automatic refetch on window focus
   refetchOnReconnect: true,         // Keep this for actual network issues
   endpoints: (builder) => ({
-    // ===== INCIDENT-BASED ENDPOINTS (NEW SYSTEM) =====
 
     // 1.1 Create Incident
     createIncident: builder.mutation({
@@ -174,7 +173,6 @@ export const reportApi = createApi({
       ],
     }),
 
-    // ===== SIMPLE FORM SUBMISSION ENDPOINTS (NEW) =====
 
     // Submit Patient Info Form
     submitPatientInfoForm: builder.mutation({