@primocaredentgroup/elettromedicali 0.1.0 → 0.1.1

package/src/component/ticketExport.ts

@@ -3,183 +3,97 @@ import { query } from './_generated/server';
 
 export const exportTickets = query({
   args: {
-    statuses: v.optional(v.array(v.string())),
-    priorities: v.optional(v.array(v.string())),
-    clinicIds: v.optional(v.array(v.id('clinics'))),
-    supplierIds: v.optional(v.array(v.id('suppliers'))),
-    createdByEmail: v.optional(v.string()),
-    ticketNumber: v.optional(v.string()),
-    dateFrom: v.optional(v.number()),
-    dateTo: v.optional(v.number()),
-    slaBreached: v.optional(v.boolean()),
-    isExternal: v.optional(v.boolean()),
-    needsAssignment: v.optional(v.boolean()),
-    hasDevice: v.optional(v.boolean()),
-    deviceCategory: v.optional(v.string()),
-    deviceBrand: v.optional(v.string()),
+    tickets: v.array(v.any()),
+    clinicDataMap: v.optional(v.any()),
   },
   handler: async (ctx, args) => {
-    let tickets = await ctx.db.query('maintenance_tasks').order('desc').take(1500);
+    const tickets = args.tickets;
 
-    if (args.statuses && args.statuses.length > 0) {
-      tickets = tickets.filter(t => args.statuses!.includes(t.status));
-    }
-
-    if (args.priorities && args.priorities.length > 0) {
-      tickets = tickets.filter(t => t.priority && args.priorities!.includes(t.priority));
-    }
-
-    if (args.clinicIds && args.clinicIds.length > 0) {
-      tickets = tickets.filter(t => args.clinicIds!.includes(t.clinicId));
-    }
-
-    if (args.supplierIds && args.supplierIds.length > 0) {
-      tickets = tickets.filter(t => t.supplierId && args.supplierIds!.includes(t.supplierId));
-    }
-
-    if (args.createdByEmail) {
-      const emailLower = args.createdByEmail.toLowerCase();
-      tickets = tickets.filter(t =>
-        t.createdByEmail?.toLowerCase().includes(emailLower)
-      );
-    }
-
-    if (args.ticketNumber) {
-      const numLower = args.ticketNumber.toLowerCase();
-      tickets = tickets.filter(t =>
-        t.ticketNumber?.toLowerCase().includes(numLower)
-      );
-    }
-
-    if (args.dateFrom) {
-      tickets = tickets.filter(t => t.created_at >= args.dateFrom!);
-    }
-
-    if (args.dateTo) {
-      tickets = tickets.filter(t => t.created_at <= args.dateTo!);
-    }
-
-    if (args.slaBreached !== undefined) {
-      tickets = tickets.filter(t => t.slaBreached === args.slaBreached);
-    }
-
-    if (args.isExternal !== undefined) {
-      tickets = tickets.filter(t => t.isExternal === args.isExternal);
-    }
-
-    if (args.needsAssignment !== undefined) {
-      tickets = tickets.filter(t => t.needsAssignment === args.needsAssignment);
-    }
-
-    if (args.hasDevice !== undefined) {
-      if (args.hasDevice) {
-        tickets = tickets.filter(t => t.deviceId);
-      } else {
-        tickets = tickets.filter(t => !t.deviceId);
-      }
-    }
-
-    const clinicIds = [...new Set(tickets.map(t => t.clinicId))].slice(0, 300);
-    const supplierIds = [...new Set(tickets.filter(t => t.supplierId).map(t => t.supplierId!))].slice(0, 300);
-    const deviceIds = [...new Set(tickets.filter(t => t.deviceId).map(t => t.deviceId!))].slice(0, 500);
-
-    const clinicsMap = new Map();
-    for (const id of clinicIds) {
-      const clinic = await ctx.db.get(id);
-      if (clinic) clinicsMap.set(id, clinic);
-    }
+    const supplierIds = [...new Set(tickets.filter((t: any) => t.supplierId).map((t: any) => t.supplierId))].slice(0, 300);
 
     const suppliersMap = new Map();
     for (const id of supplierIds) {
-      const supplier = await ctx.db.get(id);
-      if (supplier) suppliersMap.set(id, supplier);
-    }
+      try {
+        const supplier = await ctx.db.get(id);
+        if (supplier) suppliersMap.set(id, supplier);
+      } catch { /* skip invalid IDs */ }
+    }
+
+    const ticketIds = tickets.map((t: any) => t._id?.toString() || t.ticketId);
+    const deviceDataEntries = await Promise.all(
+      ticketIds.map(async (tid: string) =>
+        ctx.db.query('ticket_device_data')
+          .withIndex('by_ticketId', q => q.eq('ticketId', tid))
+          .first()
+      )
+    );
+    const validDeviceData = deviceDataEntries.filter(Boolean);
+    const deviceDataMap = new Map(validDeviceData.map(d => [d!.ticketId, d!]));
+
+    const deviceIds = [...new Set(
+      validDeviceData.filter((d): d is NonNullable<typeof d> => d != null && !!d.deviceId).map(d => d.deviceId!)
+    )].slice(0, 500);
 
     const devicesMap = new Map();
     for (const id of deviceIds) {
       const device = await ctx.db.get(id);
-      if (device) devicesMap.set(id, device);
+      if (device) devicesMap.set(id.toString(), device);
     }
 
-    if (args.deviceCategory || args.deviceBrand) {
-      tickets = tickets.filter(t => {
-        if (!t.deviceId) return false;
-        const device = devicesMap.get(t.deviceId);
-        if (!device) return false;
-
-        if (args.deviceCategory && device.category !== args.deviceCategory) {
-          return false;
-        }
-        if (args.deviceBrand && device.brand !== args.deviceBrand) {
-          return false;
-        }
-        return true;
-      });
+    const clinicsMap = new Map();
+    if (args.clinicDataMap && typeof args.clinicDataMap === 'object') {
+      for (const [id, data] of Object.entries(args.clinicDataMap)) {
+        clinicsMap.set(id, data);
+      }
     }
 
     const statuses = await ctx.db.query('ticket_statuses').collect();
     const statusMap = new Map(statuses.map(s => [s.name, s.label]));
 
-    const enrichedTickets = tickets.map(t => {
+    const enrichedTickets = tickets.map((t: any) => {
       const clinic = clinicsMap.get(t.clinicId);
       const supplier = t.supplierId ? suppliersMap.get(t.supplierId) : null;
-      const device = t.deviceId ? devicesMap.get(t.deviceId) : null;
+      const dd = deviceDataMap.get(t._id?.toString() || t.ticketId);
+      const device = dd?.deviceId ? devicesMap.get(dd.deviceId.toString()) : null;
 
       return {
-        _id: t._id,
+        _id: t._id || t.ticketId,
         ticketNumber: t.ticketNumber || '-',
-
         title: t.title || '-',
         description: t.description,
         status: t.status,
         statusLabel: statusMap.get(t.status) || t.status,
         priority: t.priority || '-',
-
         createdByEmail: t.createdByEmail || '-',
-        created_by: t.created_by,
-
-        created_at: t.created_at,
-        createdAtFormatted: new Date(t.created_at).toLocaleString('it-IT'),
-        updated_at: t.updated_at,
-        updatedAtFormatted: new Date(t.updated_at).toLocaleString('it-IT'),
-
+        created_at: t.created_at || t.lastActivityAt,
+        createdAtFormatted: t.created_at ? new Date(t.created_at).toLocaleString('it-IT') : '-',
+        updated_at: t.updated_at || t.lastActivityAt,
+        updatedAtFormatted: t.updated_at ? new Date(t.updated_at).toLocaleString('it-IT') : '-',
         clinicId: t.clinicId,
-        clinicName: clinic?.name || '-',
-        clinicAddress: clinic?.address || '-',
-        clinicRegion: clinic?.region || '-',
-
+        clinicName: (clinic as any)?.name || '-',
+        clinicAddress: (clinic as any)?.address || '-',
+        clinicRegion: (clinic as any)?.region || '-',
         supplierId: t.supplierId || null,
         supplierName: supplier?.name || '-',
         supplierEmail: supplier?.contact_email || '-',
-
-        deviceId: t.deviceId || null,
+        deviceId: dd?.deviceId || null,
         deviceName: device?.name || '-',
         deviceCategory: device?.category || '-',
         deviceBrand: device?.brand || '-',
         deviceModel: device?.model || '-',
         deviceSerialNumber: device?.serial_number || '-',
-
         slaDeadline: t.slaDeadline || null,
         slaDeadlineFormatted: t.slaDeadline ? new Date(t.slaDeadline).toLocaleString('it-IT') : '-',
         slaBreached: t.slaBreached || false,
-
-        isExternal: t.isExternal || false,
-        needsAssignment: t.needsAssignment || false,
-
+        isExternal: t.isExternalApi || false,
         notes: t.notes || '-',
         customFields: t.customFields || {},
-
-        externalTicketId: t.externalTicketId || '-',
-        externalTicketNumber: t.externalTicketNumber || '-',
-        importSource: t.importSource || '-',
-
-        photosCount: t.photos?.length || 0,
-
-        deviceQuestionAnswers: t.deviceQuestionAnswers || [],
+        photosCount: dd?.photoStorageIds?.length || 0,
+        deviceQuestionAnswers: dd?.deviceQuestionAnswers || [],
       };
     });
 
-    enrichedTickets.sort((a, b) => b.created_at - a.created_at);
+    enrichedTickets.sort((a: any, b: any) => (b.created_at || 0) - (a.created_at || 0));
 
     return {
       tickets: enrichedTickets,
@@ -189,13 +103,14 @@ export const exportTickets = query({
 });
 
 export const getFilterOptions = query({
-  args: {},
-  handler: async (ctx) => {
+  args: {
+    clinics: v.optional(v.array(v.any())),
+  },
+  handler: async (ctx, args) => {
     const statuses = await ctx.db.query('ticket_statuses').collect();
     const statusOptions = statuses.map(s => ({ value: s.name, label: s.label }));
 
-    const clinics = await ctx.db.query('clinics').collect();
-    const clinicOptions = clinics.map(c => ({ value: c._id, label: c.name }));
+    const clinicOptions = args.clinics || [];
 
     const suppliers = await ctx.db.query('suppliers').collect();
     const supplierOptions = suppliers.map(s => ({ value: s._id, label: s.name }));
@@ -211,7 +126,7 @@ export const getFilterOptions = query({
         { value: 'medium', label: 'Media' },
         { value: 'high', label: 'Alta' },
       ],
-      clinics: clinicOptions.sort((a, b) => a.label.localeCompare(b.label)),
+      clinics: clinicOptions,
       suppliers: supplierOptions.sort((a, b) => a.label.localeCompare(b.label)),
       deviceCategories: categories.sort(),
       deviceBrands: brands.sort(),

package/src/component/ticketHistory.ts

@@ -1,24 +1,22 @@
 import { v } from 'convex/values';
 import { query, mutation, internalMutation } from './_generated/server';
 
-// Get ticket history (admin only)
 export const getTicketHistory = query({
-  args: { ticketId: v.id('maintenance_tasks') },
+  args: { ticketId: v.string() },
   handler: async (ctx, args) => {
     const history = await ctx.db
       .query('ticket_history')
-      .withIndex('by_ticketId', (q: any) => q.eq('ticketId', args.ticketId))
+      .withIndex('by_ticketId_timestamp', (q: any) => q.eq('ticketId', args.ticketId))
+      .order('desc')
       .take(200);
 
-    // Sort by timestamp descending (most recent first)
-    return history.sort((a, b) => b.timestamp - a.timestamp);
+    return history;
   },
 });
 
-// Add history entry (internal mutation - called by other functions)
 export const addHistoryEntry = internalMutation({
   args: {
-    ticketId: v.id('maintenance_tasks'),
+    ticketId: v.string(),
     eventType: v.union(
       v.literal('created'),
       v.literal('status_change'),
@@ -53,10 +51,9 @@ export const addHistoryEntry = internalMutation({
   },
 });
 
-// Public mutation to add history (for use from frontend/other mutations)
 export const recordHistoryEvent = mutation({
   args: {
-    ticketId: v.id('maintenance_tasks'),
+    ticketId: v.string(),
     eventType: v.union(
       v.literal('created'),
       v.literal('status_change'),

package/src/component/ticketMacros.ts

@@ -1,10 +1,9 @@
 import { v } from 'convex/values';
 import { query, mutation } from './_generated/server';
-import type { Id } from './_generated/dataModel';
 
 export const listMacros = query({
   args: {
-    userProfileId: v.optional(v.id('user_profiles')),
+    userProfileId: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
     const allMacros = await ctx.db.query('ticket_macros').collect();
@@ -13,25 +12,18 @@ export const listMacros = query({
       m.isGlobal || (args.userProfileId && m.createdBy === args.userProfileId)
     );
 
-    const macrosWithCreator = await Promise.all(
-      filteredMacros.map(async (macro) => {
-        const creator = await ctx.db.get(macro.createdBy);
-        return {
-          ...macro,
-          creatorName: creator?.name || creator?.email || 'Sconosciuto',
-          creatorEmail: creator?.email,
-          isOwner: args.userProfileId ? macro.createdBy === args.userProfileId : false,
-        };
-      })
-    );
-
-    return macrosWithCreator;
+    return filteredMacros.map((macro) => ({
+      ...macro,
+      creatorName: macro.createdBy,
+      creatorEmail: undefined,
+      isOwner: args.userProfileId ? macro.createdBy === args.userProfileId : false,
+    }));
   },
 });
 
 export const listActiveMacros = query({
   args: {
-    userProfileId: v.optional(v.id('user_profiles')),
+    userProfileId: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
     const allMacros = await ctx.db
@@ -53,7 +45,7 @@ export const listActiveMacros = query({
 export const getMacro = query({
   args: {
     macroId: v.id('ticket_macros'),
-    userProfileId: v.optional(v.id('user_profiles')),
+    userProfileId: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
     const macro = await ctx.db.get(args.macroId);
@@ -77,7 +69,7 @@ export const createMacro = mutation({
     actions: v.object({
       changeStatus: v.optional(v.string()),
       assignSupplier: v.optional(v.id('suppliers')),
-      assignUser: v.optional(v.id('user_profiles')),
+      assignUser: v.optional(v.string()),
       setSlaHours: v.optional(v.number()),
       applySlaRule: v.optional(v.boolean()),
       addNote: v.optional(v.string()),
@@ -87,7 +79,7 @@ export const createMacro = mutation({
       })),
       setPriority: v.optional(v.string()),
     }),
-    createdBy: v.id('user_profiles'),
+    createdBy: v.string(),
   },
   handler: async (ctx, args) => {
     const macroId = await ctx.db.insert('ticket_macros', {
@@ -115,7 +107,7 @@ export const updateMacro = mutation({
     actions: v.optional(v.object({
       changeStatus: v.optional(v.string()),
       assignSupplier: v.optional(v.id('suppliers')),
-      assignUser: v.optional(v.id('user_profiles')),
+      assignUser: v.optional(v.string()),
       setSlaHours: v.optional(v.number()),
       applySlaRule: v.optional(v.boolean()),
       addNote: v.optional(v.string()),
@@ -181,7 +173,7 @@ export const duplicateMacro = mutation({
   args: {
     macroId: v.id('ticket_macros'),
     newName: v.string(),
-    createdBy: v.id('user_profiles'),
+    createdBy: v.string(),
   },
   handler: async (ctx, args) => {
     const macro = await ctx.db.get(args.macroId);
@@ -207,8 +199,8 @@ export const duplicateMacro = mutation({
 export const executeMacro = mutation({
   args: {
     macroId: v.id('ticket_macros'),
-    ticketId: v.id('maintenance_tasks'),
-    userProfileId: v.optional(v.id('user_profiles')),
+    ticketId: v.string(),
+    userProfileId: v.optional(v.string()),
     userAuth0Id: v.optional(v.string()),
     userName: v.optional(v.string()),
     userEmail: v.optional(v.string()),
@@ -227,13 +219,8 @@ export const executeMacro = mutation({
       throw new Error('Non hai accesso a questa macro');
     }
 
-    const ticket = await ctx.db.get(args.ticketId);
-    if (!ticket) {
-      throw new Error('Ticket non trovato');
-    }
-
     const actions = macro.actions;
-    const updates: any = { updated_at: Date.now() };
+    const updates: any = {};
     const executedActions: string[] = [];
 
     if (actions.changeStatus) {
@@ -247,16 +234,18 @@ export const executeMacro = mutation({
     }
 
     if (actions.assignUser) {
-      const user = await ctx.db.get(actions.assignUser);
-      if (user?.supplierId) {
-        updates.supplierId = user.supplierId;
+      const userSettings = await ctx.db
+        .query('user_profiles')
+        .withIndex('by_auth0Id', (q: any) => q.eq('auth0Id', actions.assignUser))
+        .first();
+      if (userSettings?.supplierId) {
+        updates.supplierId = userSettings.supplierId;
       }
       executedActions.push('Utente assegnato');
     }
 
     if (actions.setSlaHours) {
-      updates.slaHours = actions.setSlaHours;
-      updates.slaDueDate = Date.now() + (actions.setSlaHours * 60 * 60 * 1000);
+      updates.slaDeadline = Date.now() + (actions.setSlaHours * 60 * 60 * 1000);
       executedActions.push(`SLA impostato a ${actions.setSlaHours} ore`);
     }
 
@@ -265,11 +254,9 @@ export const executeMacro = mutation({
       executedActions.push(`Priorità impostata a: ${actions.setPriority}`);
     }
 
-    await ctx.db.patch(args.ticketId, updates);
-
     if (actions.addNote) {
       await ctx.db.insert('ticket_comments', {
-        taskId: args.ticketId,
+        ticketId: args.ticketId,
         authorId: args.userAuth0Id || 'system',
         authorName: args.userName || args.userEmail || 'Sistema',
         authorEmail: args.userEmail || 'system@app',
@@ -286,6 +273,7 @@ export const executeMacro = mutation({
       ticketId: args.ticketId,
       macroName: macro.name,
       executedActions,
+      ticketUpdates: updates,
     };
   },
 });

package/src/component/ticketStatuses.ts

@@ -74,15 +74,14 @@ export const updateTicketStatus = mutation({
 });
 
 export const deleteTicketStatus = mutation({
-  args: { statusId: v.id('ticket_statuses') },
+  args: {
+    statusId: v.id('ticket_statuses'),
+    hasLinkedTickets: v.optional(v.boolean()),
+  },
   handler: async (ctx, args) => {
     const status = await ctx.db.get(args.statusId);
     if (!status) throw new Error('Status not found');
-    const ticketsWithStatus = await ctx.db
-      .query('maintenance_tasks')
-      .withIndex('by_status', (q: any) => q.eq('status', status.name))
-      .first();
-    if (ticketsWithStatus) {
+    if (args.hasLinkedTickets) {
       throw new Error('Cannot delete status: tickets are using it. Deactivate it instead.');
     }
     await ctx.db.delete(args.statusId);