@openmrs/esm-appointments-app 5.2.2-pre.2602 → 5.2.2-pre.2607

package/src/appointments-calendar/weekly/{weekly-view-workload.test.tsx → weekly-workload-view.test.tsx}

@@ -1,11 +1,11 @@
 import React from 'react';
 import dayjs from 'dayjs';
+import WeeklyWorkloadView from './weekly-workload-view.component';
+import { type CalendarType, type DailyAppointmentsCountByService } from '../../types';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { type CalendarType } from '../../types';
 import { spaBasePath } from '../../constants';
 import { navigate } from '@openmrs/esm-framework';
-import WeeklyWorkloadView from './weekly-view-workload.component';
 
 jest.mock('@openmrs/esm-framework', () => ({
   ...jest.requireActual('@openmrs/esm-framework'),
@@ -14,19 +14,21 @@ jest.mock('@openmrs/esm-framework', () => ({
 }));
 
 describe('WeeklyWorkloadView Component', () => {
+  const events: Array<DailyAppointmentsCountByService> = [
+    {
+      appointmentDate: '2023-08-17',
+      services: [
+        { serviceName: 'HIV', count: 2 },
+        { serviceName: 'Lab testing', count: 3 },
+      ],
+    },
+  ];
+
   const mockData = {
     type: 'weekly' as CalendarType,
     dateTime: dayjs('2023-08-17'),
     currentDate: dayjs('2023-08-17'),
-    events: [
-      {
-        appointmentDate: '2023-08-17',
-        service: [
-          { serviceName: 'HIV', count: 2 },
-          { serviceName: 'Lab testing', count: 3 },
-        ],
-      },
-    ],
+    events: events,
     index: 1,
   };
 

package/src/hooks/useAppointmentsCalendar.ts

@@ -1,36 +1,44 @@
-import { openmrsFetch, type OpenmrsResource } from '@openmrs/esm-framework';
+import { openmrsFetch } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { omrsDateFormat } from '../constants';
+import { type DailyAppointmentsCountByService } from '../types';
 
-interface CalendarEvent {
-  services: Array<{
-    appointmentServiceName: string;
-    allAppointmentsCount: number;
-    missedAppointmentsCount: number | null;
-    appointmentDate: string | null;
-  }>;
-  appointmentDate: string;
-  appointmentService: string;
-  appointmentCountMap: OpenmrsResource | null;
-  totalServiceCount: number;
+interface AppointmentCountMapEntry {
+  allAppointmentsCount: number;
+}
+
+interface AppointmentSummaryResponse {
+  appointmentService: {
+    name: string;
+  };
+  appointmentCountMap: Map<string, AppointmentCountMapEntry>;
 }
 
 export const useAppointmentsCalendar = (forDate: string, period: string) => {
   const { startDate, endDate } = evaluateAppointmentCalendarDates(forDate, period);
-  const url = `/ws/rest/v1/appointment/appointmentCalendar?startDate=${startDate}&endDate=${endDate}`;
+  const url = `/ws/rest/v1/appointment/appointmentSummary?startDate=${startDate}&endDate=${endDate}`;
 
-  const { data, error, isLoading } = useSWR<{ data: Array<CalendarEvent> }>(
+  const { data, error, isLoading } = useSWR<{ data: Array<AppointmentSummaryResponse> }>(
     startDate && endDate ? url : null,
     openmrsFetch,
     { errorRetryCount: 2 },
   );
-  const results =
-    data?.data.map((event) => ({
-      appointmentDate: event.appointmentDate,
-      service: event.services.map((s) => ({ serviceName: s.appointmentServiceName, count: s.allAppointmentsCount })),
-    })) ?? [];
-
+  const results: Array<DailyAppointmentsCountByService> = data?.data.reduce((acc, service) => {
+    const serviceName = service.appointmentService.name;
+    Object.entries(service.appointmentCountMap).map(([key, value]) => {
+      const existingEntry = acc.find((entry) => entry.appointmentDate === key);
+      if (existingEntry) {
+        existingEntry.services.push({ serviceName, count: value.allAppointmentsCount });
+      } else {
+        acc.push({
+          appointmentDate: key,
+          services: [{ serviceName, count: value.allAppointmentsCount }],
+        });
+      }
+    });
+    return acc;
+  }, []);
   return { isLoading, calendarEvents: results, error };
 };
 

package/src/types/index.ts

@@ -199,3 +199,11 @@ export interface Identifier {
   identifier: string;
   identifierName?: string;
 }
+
+export interface DailyAppointmentsCountByService {
+  appointmentDate: string;
+  services: Array<{
+    serviceName: string;
+    count: number;
+  }>;
+}