@primocaredentgroup/elettromedicali 0.1.0 → 0.1.1

package/src/component/devices.ts

@@ -13,60 +13,83 @@ async function getPhotoUrl(ctx: any, device: any) {
 
 export const listDevices = query({
   args: {
-    paginationOpts: v.optional(v.object({
-      numItems: v.number(),
-      cursor: v.union(v.string(), v.null()),
-    })),
-    clinicId: v.optional(v.id('clinics')),
+    page: v.optional(v.number()),
+    pageSize: v.optional(v.number()),
+    clinicId: v.optional(v.string()),
+    search: v.optional(v.string()),
+    category: v.optional(v.string()),
+    status: v.optional(v.string()),
     _triggerReload: v.optional(v.number()),
     userRole: v.optional(v.string()),
-    userClinicId: v.optional(v.id('clinics')),
+    userClinicId: v.optional(v.string()),
     userSelectedClinicId: v.optional(v.number()),
+    userSupplierId: v.optional(v.id('suppliers')),
   },
   handler: async (ctx, args) => {
-    const limit = args.paginationOpts?.numItems || 100;
+    const page = args.page || 1;
+    const pageSize = args.pageSize || 40;
 
-    let devices: any[];
+    let baseQuery;
     if (args.userRole === 'admin') {
       if (args.clinicId) {
-        const result = await ctx.db
-          .query('devices')
-          .withIndex('by_clinicId', (q: any) => q.eq('clinicId', args.clinicId))
-          .paginate({ numItems: limit, cursor: args.paginationOpts?.cursor || null });
-        devices = result.page;
+        baseQuery = ctx.db.query('devices')
+          .withIndex('by_clinicId', (q: any) => q.eq('clinicId', args.clinicId));
+      } else if (args.userSelectedClinicId) {
+        baseQuery = ctx.db.query('devices')
+          .withIndex('by_primoupClinicId', (q: any) => q.eq('primoupClinicId', args.userSelectedClinicId));
       } else {
-        const result = await ctx.db
-          .query('devices')
-          .paginate({ numItems: limit, cursor: args.paginationOpts?.cursor || null });
-        devices = result.page;
+        baseQuery = ctx.db.query('devices');
+      }
+    } else if (args.userRole === 'supplier') {
+      if (args.userSupplierId) {
+        baseQuery = ctx.db.query('devices')
+          .withIndex('by_supplierId', (q: any) => q.eq('supplierId', args.userSupplierId));
+      } else {
+        return { page: [], totalCount: 0, totalPages: 0, currentPage: page };
       }
     } else if (args.userRole === 'user') {
-      try {
-        const selectedClinicId = args.userSelectedClinicId;
-
-        if (selectedClinicId) {
-          devices = await ctx.db
-            .query('devices')
-            .withIndex('by_primoupClinicId', (q: any) => q.eq('primoupClinicId', selectedClinicId))
-            .take(limit);
-        } else {
-          devices = [];
-        }
-      } catch (error: any) {
-        devices = [];
+      if (args.userSelectedClinicId) {
+        baseQuery = ctx.db.query('devices')
+          .withIndex('by_primoupClinicId', (q: any) => q.eq('primoupClinicId', args.userSelectedClinicId));
+      } else {
+        return { page: [], totalCount: 0, totalPages: 0, currentPage: page };
       }
     } else {
-      devices = [];
+      return { page: [], totalCount: 0, totalPages: 0, currentPage: page };
     }
 
+    let allDevices = await baseQuery.collect();
+
+    if (args.search) {
+      const s = args.search.toLowerCase();
+      allDevices = allDevices.filter((d: any) =>
+        d.name?.toLowerCase().includes(s) ||
+        d.brand?.toLowerCase().includes(s) ||
+        d.model?.toLowerCase().includes(s) ||
+        d.serialNumber?.toLowerCase().includes(s) ||
+        d.internalId?.toLowerCase().includes(s)
+      );
+    }
+    if (args.category) {
+      allDevices = allDevices.filter((d: any) => d.category === args.category);
+    }
+    if (args.status) {
+      allDevices = allDevices.filter((d: any) => d.status === args.status);
+    }
+
+    const totalCount = allDevices.length;
+    const totalPages = Math.ceil(totalCount / pageSize);
+    const startIndex = (page - 1) * pageSize;
+    const pageDevices = allDevices.slice(startIndex, startIndex + pageSize);
+
     const devicesWithUrls = await Promise.all(
-      devices.map(async (device) => ({
+      pageDevices.map(async (device: any) => ({
         ...device,
         photoUrl: await getPhotoUrl(ctx, device),
       }))
     );
 
-    return devicesWithUrls;
+    return { page: devicesWithUrls, totalCount, totalPages, currentPage: page };
   },
 });
 
@@ -80,9 +103,9 @@ export const listDevicesPaginated = query({
     brand: v.optional(v.string()),
     status: v.optional(v.string()),
     searchTerm: v.optional(v.string()),
-    clinicId: v.optional(v.id('clinics')),
+    clinicId: v.optional(v.string()),
     userRole: v.optional(v.string()),
-    userClinicId: v.optional(v.id('clinics')),
+    userClinicId: v.optional(v.string()),
     userSelectedClinicId: v.optional(v.number()),
   },
   handler: async (ctx, args) => {
@@ -132,9 +155,12 @@ export const listDevicesPaginated = query({
       filteredQuery = filteredQuery.filter((q: any) => q.eq(q.field('status'), args.status));
     }
 
-    const result = await filteredQuery.paginate(args.paginationOpts);
+    const limit = args.paginationOpts.numItems + 1;
+    const allResults = await filteredQuery.take(limit);
+    const isDone = allResults.length < limit;
+    const page = isDone ? allResults : allResults.slice(0, -1);
 
-    let filteredPage = result.page;
+    let filteredPage = page;
 
     if (args.searchTerm) {
       const search = args.searchTerm.toLowerCase();
@@ -147,10 +173,6 @@ export const listDevicesPaginated = query({
       );
     }
 
-    const clinicIds = [...new Set(filteredPage.map((d: any) => d.clinicId).filter(Boolean))];
-    const clinics = await Promise.all(clinicIds.map(id => ctx.db.get(id)));
-    const clinicMap = new Map(clinics.filter(Boolean).map((c: any) => [c._id.toString(), c.name]));
-
     const minimalPage = await Promise.all(
       filteredPage.map(async (device: any) => ({
         _id: device._id,
@@ -162,7 +184,7 @@ export const listDevicesPaginated = query({
         internalId: device.internalId,
         status: device.status,
         clinicId: device.clinicId,
-        clinicName: clinicMap.get(device.clinicId?.toString()) || 'Unknown',
+        clinicName: '',
         photoUrl: device.photoStorageId
           ? await ctx.storage.getUrl(device.photoStorageId)
           : null,
@@ -171,8 +193,8 @@ export const listDevicesPaginated = query({
 
     return {
       page: minimalPage,
-      isDone: result.isDone,
-      continueCursor: result.continueCursor,
+      isDone,
+      continueCursor: '',
     };
   },
 });
@@ -182,9 +204,9 @@ export const getDevicesCount = query({
     category: v.optional(v.string()),
     brand: v.optional(v.string()),
     status: v.optional(v.string()),
-    clinicId: v.optional(v.id('clinics')),
+    clinicId: v.optional(v.string()),
     userRole: v.optional(v.string()),
-    userClinicId: v.optional(v.id('clinics')),
+    userClinicId: v.optional(v.string()),
     userSelectedClinicId: v.optional(v.number()),
   },
   handler: async (ctx, args) => {
@@ -276,7 +298,8 @@ export const generateUploadUrl = mutation({
 
 export const createDevice = mutation({
   args: {
-    clinicId: v.id('clinics'),
+    clinicId: v.string(),
+    primoupClinicId: v.optional(v.number()),
     supplierId: v.optional(v.id('suppliers')),
     name: v.string(),
     category: v.string(),
@@ -308,14 +331,6 @@ export const createDevice = mutation({
   handler: async (ctx, args) => {
     const deviceData: any = { ...args };
 
-    const clinic = await ctx.db.get(args.clinicId);
-    if (clinic?.primoupId) {
-      const primoupIdNum = parseInt(clinic.primoupId, 10);
-      if (!isNaN(primoupIdNum)) {
-        deviceData.primoupClinicId = primoupIdNum;
-      }
-    }
-
     const deviceId = await ctx.db.insert('devices', deviceData);
     return deviceId;
   },
@@ -324,7 +339,7 @@ export const createDevice = mutation({
 export const updateDevice = mutation({
   args: {
     deviceId: v.id('devices'),
-    clinicId: v.optional(v.id('clinics')),
+    clinicId: v.optional(v.string()),
     primoupClinicId: v.optional(v.number()),
     supplierId: v.optional(v.id('suppliers')),
     name: v.optional(v.string()),
@@ -385,7 +400,7 @@ export const updateDeviceByUser = mutation({
     industry40Data: v.optional(v.string()),
     userRole: v.string(),
     userSelectedClinicId: v.optional(v.number()),
-    userClinicId: v.optional(v.id('clinics')),
+    userClinicId: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
     const device = await ctx.db.get(args.deviceId);
@@ -429,7 +444,7 @@ export const deleteDevice = mutation({
 export const getDeviceStats = query({
   args: {
     userRole: v.optional(v.string()),
-    userClinicId: v.optional(v.id('clinics')),
+    userClinicId: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
     try {
@@ -478,29 +493,17 @@ export const getFileUrl = query({
 export const listAllDevicesForExport = query({
   args: {},
   handler: async (ctx) => {
-    const clinics = await ctx.db.query('clinics').take(500);
-    const results: any[] = [];
-
-    for (const clinic of clinics) {
-      const clinicDevices = await ctx.db
-        .query('devices')
-        .withIndex('by_clinicId', (q: any) => q.eq('clinicId', clinic._id))
-        .take(1000);
-
-      for (const device of clinicDevices) {
-        results.push({
-          clinicName: clinic.name || 'Sconosciuta',
-          category: device.category || '',
-          brand: device.brand || '',
-          model: device.model || '',
-          serial_number: device.serial_number || '',
-          quantity: device.quantity || 1,
-          status: device.status || 'active',
-        });
-      }
-    }
-
-    return results;
+    const devices = await ctx.db.query('devices').take(5000);
+    return devices.map(device => ({
+      clinicId: device.clinicId,
+      clinicName: '',
+      category: device.category || '',
+      brand: device.brand || '',
+      model: device.model || '',
+      serial_number: device.serial_number || '',
+      quantity: device.quantity || 1,
+      status: device.status || 'active',
+    }));
   },
 });
 
@@ -557,40 +560,18 @@ export const getDeviceTemplates = query({
 
 export const createDeviceByUser = mutation({
   args: {
+    clinicId: v.string(),
     name: v.string(),
     category: v.string(),
     brand: v.string(),
     model: v.string(),
     serial_number: v.string(),
     userSelectedClinicId: v.number(),
-    userPrimoupClinics: v.optional(v.array(v.any())),
   },
   handler: async (ctx, args) => {
-    const selectedClinicId = args.userSelectedClinicId;
-
-    const primoupClinics = args.userPrimoupClinics || [];
-    const selectedPrimoupClinic = primoupClinics.find((c: any) => c.id === selectedClinicId);
-
-    if (!selectedPrimoupClinic) {
-      throw new Error('Selected clinic not found in user profile');
-    }
-
-    let clinic = await ctx.db
-      .query('clinics')
-      .withIndex('by_primoupId', (q: any) => q.eq('primoupId', String(selectedClinicId)))
-      .first();
-    if (!clinic) {
-      const clinics = await ctx.db.query('clinics').take(500);
-      clinic = clinics.find(c => c.name === selectedPrimoupClinic.name) || null;
-    }
-
-    if (!clinic) {
-      throw new Error('Clinic not found in database');
-    }
-
     const deviceId = await ctx.db.insert('devices', {
-      clinicId: clinic._id,
-      primoupClinicId: selectedClinicId,
+      clinicId: args.clinicId,
+      primoupClinicId: args.userSelectedClinicId,
       name: args.name,
       category: args.category,
       brand: args.brand,

package/src/component/emailHelpers.ts

@@ -2,20 +2,11 @@ import { query } from './_generated/server';
 import { v } from 'convex/values';
 
 export const getAdminEmails = query({
-  args: {},
-  handler: async (ctx) => {
-    const adminRole = await ctx.db
-      .query('roles')
-      .withIndex('by_name', (q) => q.eq('name', 'admin'))
-      .first();
-    if (!adminRole) return [];
-    const adminUsers = await ctx.db
-      .query('user_profiles')
-      .withIndex('by_roleId', (q) => q.eq('roleId', adminRole._id))
-      .collect();
-    return adminUsers
-      .filter((user) => user.email)
-      .map((user) => ({ email: user.email, name: user.name || user.email }));
+  args: {
+    adminEmails: v.optional(v.array(v.object({ email: v.string(), name: v.string() }))),
+  },
+  handler: async (_ctx, args) => {
+    return args.adminEmails || [];
   },
 });
 
@@ -29,10 +20,9 @@ export const getSupplierEmail = query({
 });
 
 export const getClinicEmail = query({
-  args: { clinicId: v.id('clinics') },
-  handler: async (ctx, args) => {
-    const clinic = await ctx.db.get(args.clinicId);
-    if (!clinic || !clinic.contact_email) return null;
-    return { email: clinic.contact_email, name: clinic.name };
+  args: { clinicId: v.string(), clinicEmail: v.optional(v.string()), clinicName: v.optional(v.string()) },
+  handler: async (_ctx, args) => {
+    if (!args.clinicEmail) return null;
+    return { email: args.clinicEmail, name: args.clinicName || 'Clinica' };
   },
 });

package/src/component/emails.ts

@@ -7,7 +7,7 @@ export const logEmail = mutation({
     to: v.union(v.string(), v.array(v.string())),
     subject: v.string(),
     html: v.string(),
-    ticketId: v.optional(v.id('maintenance_tasks')),
+    ticketId: v.optional(v.string()),
     status: v.union(v.literal('sent'), v.literal('failed'), v.literal('pending')),
     resendId: v.optional(v.string()),
     errorMessage: v.optional(v.string()),
@@ -28,7 +28,7 @@ export const logEmail = mutation({
 });
 
 export const getEmailLogsByTicket = query({
-  args: { ticketId: v.id('maintenance_tasks') },
+  args: { ticketId: v.string() },
   handler: async (ctx, args) => {
     return await ctx.db
       .query('email_logs')

package/src/component/http.ts

@@ -54,7 +54,7 @@ http.route({
 
       try {
         const commentId = await ctx.runMutation(api.ticketComments.addCommentFromApi, {
-          taskId: ticketId,
+          ticketId,
           content: content.trim(),
           authorEmail: authorEmail || undefined,
           authorName: authorName || undefined,
@@ -99,7 +99,7 @@ http.route({
       const ticketId = url.searchParams.get('ticketId');
       if (!ticketId) return errorResponse('Parametro "ticketId" obbligatorio', 400);
 
-      const comments = await ctx.runQuery(internal.ticketComments.listCommentsInternal, { taskId: ticketId });
+      const comments = await ctx.runQuery(internal.ticketComments.listCommentsInternal, { ticketId });
       await ctx.runMutation(internal.apiKeys.recordApiKeyUsage, { keyId: keyData.keyId });
 
       return jsonResponse({ success: true, comments, count: comments.length });
@@ -110,111 +110,6 @@ http.route({
   }),
 });
 
-http.route({
-  path: '/api/tickets/get',
-  method: 'OPTIONS',
-  handler: httpAction(async () => {
-    return new Response(null, { status: 204, headers: corsHeaders });
-  }),
-});
-
-http.route({
-  path: '/api/tickets/get',
-  method: 'GET',
-  handler: httpAction(async (ctx, request) => {
-    try {
-      const apiKey = request.headers.get('X-API-Key');
-      if (!apiKey) return errorResponse('API key mancante', 401);
-
-      const keyData = await ctx.runQuery(api.apiKeys.validateApiKey, { plainKey: apiKey });
-      if (!keyData) return errorResponse('API key non valida', 401);
-      if (!keyData.permissions.includes('tickets:read')) {
-        return errorResponse('API key non ha il permesso "tickets:read"', 403);
-      }
-
-      const url = new URL(request.url);
-      const ticketId = url.searchParams.get('ticketId');
-      if (!ticketId) return errorResponse('Parametro "ticketId" obbligatorio', 400);
-
-      const ticket = await ctx.runQuery(internal.maintenanceTasks.getTicketInternal, { taskId: ticketId });
-      if (!ticket) return errorResponse('Ticket non trovato', 404);
-
-      await ctx.runMutation(internal.apiKeys.recordApiKeyUsage, { keyId: keyData.keyId });
-      return jsonResponse({ success: true, ticket });
-    } catch (error: any) {
-      console.error('Error in /api/tickets/get:', error);
-      return errorResponse('Errore interno: ' + error.message, 500);
-    }
-  }),
-});
-
-http.route({
-  path: '/api/tickets/create',
-  method: 'OPTIONS',
-  handler: httpAction(async () => {
-    return new Response(null, { status: 204, headers: corsHeaders });
-  }),
-});
-
-http.route({
-  path: '/api/tickets/create',
-  method: 'POST',
-  handler: httpAction(async (ctx, request) => {
-    try {
-      const apiKey = request.headers.get('X-API-Key');
-      if (!apiKey) return errorResponse('API key mancante. Usa header X-API-Key', 401);
-
-      const keyData = await ctx.runQuery(api.apiKeys.validateApiKey, { plainKey: apiKey });
-      if (!keyData) return errorResponse('API key non valida o scaduta', 401);
-      if (!keyData.permissions.includes('tickets:create')) {
-        return errorResponse('API key non ha il permesso "tickets:create"', 403);
-      }
-
-      let body: any;
-      try { body = await request.json(); } catch { return errorResponse('Body JSON non valido', 400); }
-
-      const { clinicId, primoupId, clinicName, description, title, externalTicketId, externalTicketNumber, creatorEmail, creatorName, priority } = body;
-
-      if (!clinicId && !primoupId && !clinicName) {
-        return errorResponse('Devi fornire almeno uno tra: clinicId, primoupId, clinicName', 400);
-      }
-      if (!description || typeof description !== 'string' || description.trim().length === 0) {
-        return errorResponse('Campo "description" obbligatorio e non vuoto', 400);
-      }
-
-      const clinic = await ctx.runQuery(internal.maintenanceTasks.findClinicInternal, {
-        clinicId, primoupId: primoupId?.toString(), clinicName,
-      });
-      if (!clinic) return errorResponse('Clinica non trovata', 404);
-
-      const validPriorities = ['low', 'medium', 'high'];
-      if (priority && !validPriorities.includes(priority)) {
-        return errorResponse(`Priorità non valida. Usa: ${validPriorities.join(', ')}`, 400);
-      }
-
-      try {
-        const taskId = await ctx.runMutation(internal.maintenanceTasks.createExternalTicket, {
-          clinicId: clinic._id as any,
-          description: description.trim(),
-          title: title || undefined,
-          externalTicketId: externalTicketId || undefined,
-          externalTicketNumber: externalTicketNumber || undefined,
-          creatorEmail: creatorEmail || undefined,
-          creatorName: creatorName || undefined,
-          priority: priority || undefined,
-        });
-        await ctx.runMutation(internal.apiKeys.recordApiKeyUsage, { keyId: keyData.keyId });
-        return jsonResponse({ success: true, ticketId: taskId, message: 'Segnalazione creata con successo.' });
-      } catch (error: any) {
-        return errorResponse('Errore nella creazione del ticket: ' + error.message, 500);
-      }
-    } catch (error: any) {
-      console.error('Error in /api/tickets/create:', error);
-      return errorResponse('Errore interno del server: ' + error.message, 500);
-    }
-  }),
-});
-
 http.route({
   path: '/api/health',
   method: 'GET',
@@ -223,7 +118,7 @@ http.route({
       success: true,
       status: 'healthy',
       timestamp: new Date().toISOString(),
-      version: '1.0.0',
+      version: '2.0.0',
     });
   }),
 });

package/src/component/migrationHelpers.ts

@@ -0,0 +1,96 @@
+import { v } from 'convex/values';
+import { query, mutation } from './_generated/server';
+
+export const listMaintenanceTasksForMigration = query({
+  args: {
+    cursor: v.optional(v.number()),
+    batchSize: v.optional(v.number()),
+  },
+  handler: async (ctx, args) => {
+    // This function reads from ticket_comments and ticket_history
+    // to reconstruct a list of known ticket IDs for migration purposes.
+    // Since maintenance_tasks table has been removed, this is a no-op placeholder.
+    // The actual migration should be run BEFORE removing the maintenance_tasks table,
+    // or data should be exported to a JSON file first.
+    return [];
+  },
+});
+
+export const updateCommentsTicketId = mutation({
+  args: {
+    oldTicketId: v.string(),
+    newTicketId: v.string(),
+  },
+  handler: async (ctx, args) => {
+    const comments = await ctx.db
+      .query('ticket_comments')
+      .withIndex('by_ticketId', (q) => q.eq('ticketId', args.oldTicketId))
+      .collect();
+
+    for (const comment of comments) {
+      await ctx.db.patch(comment._id, { ticketId: args.newTicketId });
+    }
+
+    return { updated: comments.length };
+  },
+});
+
+export const updateHistoryTicketId = mutation({
+  args: {
+    oldTicketId: v.string(),
+    newTicketId: v.string(),
+  },
+  handler: async (ctx, args) => {
+    const entries = await ctx.db
+      .query('ticket_history')
+      .withIndex('by_ticketId', (q) => q.eq('ticketId', args.oldTicketId))
+      .collect();
+
+    for (const entry of entries) {
+      await ctx.db.patch(entry._id, { ticketId: args.newTicketId });
+    }
+
+    return { updated: entries.length };
+  },
+});
+
+export const updateEmailLogsTicketId = mutation({
+  args: {
+    oldTicketId: v.string(),
+    newTicketId: v.string(),
+  },
+  handler: async (ctx, args) => {
+    const logs = await ctx.db
+      .query('email_logs')
+      .withIndex('by_ticketId', (q) => q.eq('ticketId', args.oldTicketId))
+      .collect();
+
+    for (const log of logs) {
+      await ctx.db.patch(log._id, { ticketId: args.newTicketId });
+    }
+
+    return { updated: logs.length };
+  },
+});
+
+export const updateRepairHistoryTicketId = mutation({
+  args: {
+    oldTicketId: v.string(),
+    newTicketId: v.string(),
+  },
+  handler: async (ctx, args) => {
+    const entries = await ctx.db
+      .query('device_repair_history')
+      .collect();
+
+    let updated = 0;
+    for (const entry of entries) {
+      if (entry.ticketId === args.oldTicketId) {
+        await ctx.db.patch(entry._id, { ticketId: args.newTicketId });
+        updated++;
+      }
+    }
+
+    return { updated };
+  },
+});

package/src/component/roles.ts

@@ -80,17 +80,16 @@ export const updateRole = mutation({
 });
 
 export const deleteRole = mutation({
-  args: { roleId: v.id('roles') },
+  args: {
+    roleId: v.id('roles'),
+    hasAssignedUsers: v.optional(v.boolean()),
+  },
   handler: async (ctx, args) => {
     const role = await ctx.db.get(args.roleId);
     if (role && (role.name === 'admin' || role.name === 'user' || role.name === 'supplier')) {
       throw new Error('Cannot delete system roles (admin, user, supplier)');
     }
-    const usersWithRole = await ctx.db
-      .query('user_profiles')
-      .withIndex('by_roleId', (q) => q.eq('roleId', args.roleId))
-      .first();
-    if (usersWithRole) {
+    if (args.hasAssignedUsers) {
       throw new Error('Cannot delete role that is assigned to users');
     }
     await ctx.db.delete(args.roleId);