@primocaredentgroup/convex-campaigns-component 0.3.1 → 0.3.3

package/convex/components/campaigns/domain/types.ts

@@ -34,7 +34,8 @@ export const SUPPRESSION_REASONS = [
   "LOWER_PRIORITY",
 ] as const;
 
-export const scopeTypeValidator = v.union(v.literal("HQ"), v.literal("CLINIC"));
+// HQ e CLINIC sono i valori predefiniti; l'host può usare altri codici (REGION, AREA, ecc.)
+export const scopeTypeValidator = v.string();
 export const campaignStatusValidator = v.union(
   v.literal("DRAFT"),
   v.literal("RUNNING"),
@@ -106,7 +107,7 @@ export const scheduleSpecValidator = v.object({
   delayMinutes: v.optional(v.number()),
 });
 
-export type CampaignScopeType = (typeof CAMPAIGN_SCOPE_TYPES)[number];
+export type CampaignScopeType = string;
 export type CampaignStatus = (typeof CAMPAIGN_STATUSES)[number];
 export type StepType = (typeof STEP_TYPES)[number];
 export type SnapshotStatus = (typeof SNAPSHOT_STATUSES)[number];

package/convex/components/campaigns/functions/authzInternal.ts

@@ -40,7 +40,12 @@ async function queryUserByEmailWithFallback(ctx: any, email: string) {
   }
 
   const users = await ctx.db.query("users").collect();
-  return users.find((user: any) => user?.isActive && user?.email === email) ?? null;
+  return (
+    users.find(
+      (u: any) =>
+        u?.isActive && u?.email?.toLowerCase() === email?.toLowerCase(),
+    ) ?? null
+  );
 }
 
 export const resolveRolesForIdentity = internalQuery({
@@ -70,10 +75,18 @@ export const resolveRolesForIdentity = internalQuery({
     const directRole = normalizeRole(user.role);
     if (directRole) roles.add(directRole);
 
-    const userClinicRoles = await ctx.db
-      .query("user_clinic_roles")
-      .withIndex("by_user", (q) => q.eq("userId", user._id))
-      .collect();
+    let userClinicRoles: Array<{ isActive?: boolean; roleId: string }>;
+    try {
+      userClinicRoles = await ctx.db
+        .query("user_clinic_roles")
+        .withIndex("by_user", (q) => q.eq("userId", user._id))
+        .collect();
+    } catch (error) {
+      if (!isIndexError(error)) throw error;
+      userClinicRoles = (
+        await ctx.db.query("user_clinic_roles").collect()
+      ).filter((r: any) => r.userId === user._id);
+    }
 
     for (const userClinicRole of userClinicRoles) {
       if (!userClinicRole.isActive) continue;

package/convex/components/campaigns/functions/mutations.ts

@@ -40,7 +40,7 @@ export const createCampaign = mutation({
       name: v.string(),
       description: v.optional(v.string()),
       ownerUserId: v.optional(v.id("users")),
-      scopeType: v.union(v.literal("HQ"), v.literal("CLINIC")),
+      scopeType: v.string(),
       scopeClinicIds: v.array(clinicScopeIdValidator),
       priority: v.number(),
       defaultRunConfig: v.optional(runConfigValidator),
@@ -67,7 +67,7 @@ export const updateCampaign = mutation({
       name: v.optional(v.string()),
       description: v.optional(v.string()),
       ownerUserId: v.optional(v.id("users")),
-      scopeType: v.optional(v.union(v.literal("HQ"), v.literal("CLINIC"))),
+      scopeType: v.optional(v.string()),
       scopeClinicIds: v.optional(v.array(clinicScopeIdValidator)),
       priority: v.optional(v.number()),
       defaultRunConfig: v.optional(runConfigValidator),

package/convex/components/campaigns/permissions.ts

@@ -56,7 +56,12 @@ async function queryUserByEmailWithFallback(ctx: AnyCtx, email: string) {
   }
 
   const users = await ctx.db.query("users").collect();
-  return users.find((user: any) => user?.isActive && user?.email === email) ?? null;
+  return (
+    users.find(
+      (u: any) =>
+        u?.isActive && u?.email?.toLowerCase() === email?.toLowerCase(),
+    ) ?? null
+  );
 }
 
 async function resolveCurrentUserWithDb(ctx: AnyCtx) {
@@ -86,10 +91,19 @@ async function getUserRoleCodes(ctx: AnyCtx, userId: Id<"users">): Promise<Set<s
     roles.add(normalizeRole(user.role));
   }
 
-  const userClinicRoles = await ctx.db
-    .query("user_clinic_roles")
-    .withIndex("by_user", (q: any) => q.eq("userId", userId))
-    .collect();
+  let userClinicRoles: any[] = [];
+  try {
+    userClinicRoles = await ctx.db
+      .query("user_clinic_roles")
+      .withIndex("by_user", (q: any) => q.eq("userId", userId))
+      .collect();
+  } catch (error) {
+    if (!isIndexError(error)) throw error;
+    userClinicRoles = (await ctx.db.query("user_clinic_roles").collect()).filter(
+      (r: any) => r.userId === userId,
+    );
+  }
+
   for (const userClinicRole of userClinicRoles) {
     if (!userClinicRole.isActive) continue;
     const roleDoc = await ctx.db.get(userClinicRole.roleId);

package/convex/components/campaigns/ports/patientData.ts

@@ -2,8 +2,8 @@ import type { QueryCtx, MutationCtx } from "../../../_generated/server";
 import type { Doc, Id } from "../../../_generated/dataModel";
 
 export type CampaignScope = {
-  scopeType: "HQ" | "CLINIC";
-  scopeClinicIds: string[];
+  scopeType: string;
+  scopeClinicIds: (Id<"clinics"> | string)[];
 };
 
 export type SegmentationRules = {
@@ -98,7 +98,7 @@ async function queryNoShowCandidates(
     if (!hasNoShow) continue;
 
     const clinicId = await deriveClinicIdFromAppointments(ctx, patient, campaignScope);
-    if (campaignScope.scopeType === "CLINIC" && !clinicId) continue;
+    if (campaignScope.scopeType !== "HQ" && !clinicId) continue;
     patients.push({
       patientId: patient._id,
       clinicId,
@@ -163,7 +163,7 @@ async function queryRecallOrQuoteFollowupCandidates(
   const patients: CandidatePatient[] = [];
   for (const patient of page.page) {
     const clinicId = await deriveClinicIdFromAppointments(ctx, patient, campaignScope);
-    if (campaignScope.scopeType === "CLINIC" && !clinicId) continue;
+    if (campaignScope.scopeType !== "HQ" && !clinicId) continue;
 
     const appointments = await ctx.db
       .query("appointments")
@@ -218,7 +218,7 @@ export async function queryCandidates(
       const patient = await ctx.db.get(patientId);
       if (!patient || patient.status === "archived") continue;
       const clinicId = await deriveClinicIdFromAppointments(ctx, patient, campaignScope);
-      if (campaignScope.scopeType === "CLINIC" && !clinicId) continue;
+      if (campaignScope.scopeType !== "HQ" && !clinicId) continue;
       patients.push({
         patientId: patient._id,
         clinicId,
@@ -260,7 +260,7 @@ export async function queryCandidates(
   const patients: CandidatePatient[] = [];
   for (const patient of page.page) {
     const clinicId = await deriveClinicIdFromAppointments(ctx, patient, campaignScope);
-    if (campaignScope.scopeType === "CLINIC" && !clinicId) continue;
+    if (campaignScope.scopeType !== "HQ" && !clinicId) continue;
     patients.push({
       patientId: patient._id,
       clinicId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primocaredentgroup/convex-campaigns-component",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Convex Campaigns backend component for PrimoCore",
   "license": "UNLICENSED",
   "type": "module",