@uxland/primary-shell 5.6.5 → 5.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.6.5",
+  "version": "5.6.6",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

package/src/internal-plugins/activity-history/activity-history-item/list/group-history-items/group-history-items.ts

@@ -2,25 +2,37 @@ import { IActivityHistoryItem, IActivityHistoryGroup, IActivityHistorySubGroup }
 import { areSameDiagnostics } from "../../domain/validation/diagnostics/are-same-diagnostics";
 import { hasValidDiagnostics } from "../../domain/validation/diagnostics/has-valid-diagnostics";
 
-const isSameVisit = (item1: IActivityHistoryItem, item2: IActivityHistoryItem): boolean => {
-  const sameProfessional =
-    item1.professional?.id === item2.professional?.id &&
-    item1.professional?.role?.id === item2.professional?.role?.id &&
-    item1.professional?.speciality?.id === item2.professional?.speciality?.id;
-  const sameLocation =
-    item1.ep?.id === item2.ep?.id &&
-    item1.up?.id === item2.up?.id &&
-    item1.center?.id === item2.center?.id &&
-    item1.service?.id === item2.service?.id;
-
-  const sameDay = new Date(item1.date).toDateString() === new Date(item2.date).toDateString();
-
-  return sameProfessional && sameLocation && sameDay;
+// Cache para evitar recalcular fechas
+const dateStringCache = new Map<string, string>();
+const dateObjectCache = new Map<string, Date>();
+
+const getDateString = (dateStr: string): string => {
+  if (!dateStringCache.has(dateStr)) {
+    dateStringCache.set(dateStr, new Date(dateStr).toDateString());
+  }
+  return dateStringCache.get(dateStr)!;
+};
+
+const getDateObject = (dateStr: string): Date => {
+  if (!dateObjectCache.has(dateStr)) {
+    dateObjectCache.set(dateStr, new Date(dateStr));
+  }
+  return dateObjectCache.get(dateStr)!;
+};
+
+// Crear una clave única para cada combinación de visita
+const createVisitKey = (item: IActivityHistoryItem): string => {
+  const professionalKey = `${item.professional?.id || 'null'}-${item.professional?.role?.id || 'null'}-${item.professional?.speciality?.id || 'null'}`;
+  const locationKey = `${item.ep?.id || 'null'}-${item.up?.id || 'null'}-${item.center?.id || 'null'}-${item.service?.id || 'null'}`;
+  const dayKey = getDateString(item.date);
+  
+  return `${professionalKey}|${locationKey}|${dayKey}`;
 };
 
 const withinEightHours = (date1: string, date2: string): boolean => {
-  const timeDifference = Math.abs(new Date(date1).getTime() - new Date(date2).getTime());
-  return timeDifference <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
+  const time1 = getDateObject(date1).getTime();
+  const time2 = getDateObject(date2).getTime();
+  return Math.abs(time1 - time2) <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
 };
 
 function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
@@ -30,12 +42,12 @@ function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
 
     group.items.forEach((item) => {
       const diagnostics = item.diagnostics;
-
       const allDiagnosticsValid = diagnostics?.length > 0 && hasValidDiagnostics(diagnostics);
 
       if (allDiagnosticsValid) {
         let addedToSubGroup = false;
 
+        // Optimización: usar for...of con break para salir temprano
         for (const subGroup of subGroups) {
           const firstSubGroupItem = subGroup.items[0];
 
@@ -63,38 +75,59 @@ function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
 }
 
 const groupActivityHistoryItems = (items: IActivityHistoryItem[]): IActivityHistoryGroup[] => {
-  const groups: IActivityHistoryGroup[] = [];
+  if (!items?.length) return [];
 
-  items?.forEach((item) => {
-    let added = false;
+  // Limpiar caches al inicio
+  dateStringCache.clear();
+  dateObjectCache.clear();
 
-    for (const group of groups) {
-      const firstItem = group.items[0];
-      const lastItem = group.items[group.items.length - 1];
+  // Mapa para agrupar por clave de visita
+  const visitGroups = new Map<string, IActivityHistoryGroup>();
+
+  items.forEach((item) => {
+    const visitKey = createVisitKey(item);
+    
+    if (!visitGroups.has(visitKey)) {
+      // Crear nuevo grupo
+      visitGroups.set(visitKey, {
+        idGroup: Math.random().toString(36).substr(2, 9),
+        items: [item],
+      });
+    } else {
+      // Verificar si está dentro del rango de 8 horas
+      const existingGroup = visitGroups.get(visitKey)!;
+      const firstItem = existingGroup.items[0];
+      const lastItem = existingGroup.items[existingGroup.items.length - 1];
 
       if (
-        isSameVisit(firstItem, item) &&
         withinEightHours(firstItem.date, item.date) &&
         withinEightHours(lastItem.date, item.date)
       ) {
-        group.items.push(item);
-        added = true;
-        break;
+        existingGroup.items.push(item);
+      } else {
+        // Si no está dentro del rango, crear un nuevo grupo con un sufijo
+        let counter = 1;
+        let newKey = `${visitKey}_${counter}`;
+        
+        while (visitGroups.has(newKey)) {
+          counter++;
+          newKey = `${visitKey}_${counter}`;
+        }
+        
+        visitGroups.set(newKey, {
+          idGroup: Math.random().toString(36).substr(2, 9),
+          items: [item],
+        });
       }
     }
-
-    if (!added) {
-      groups.push({
-        idGroup: Math.random().toString(36).substr(2, 9),
-        items: [item],
-      });
-    }
   });
 
-  // Crear subgrupos por diagnósticos iguales. Los items que no tienen diagnostico, se quedan fuera de subgrupos (remaining items)
+  const groups = Array.from(visitGroups.values());
+
+  // Crear subgrupos por diagnósticos iguales
   groupByValidDiagnostics(groups);
 
   return groups;
 };
 
-export { groupActivityHistoryItems };
+export { groupActivityHistoryItems };