@blackcode_sa/metaestetics-api 1.15.17-staging.7 → 1.15.17-staging.9

package/src/config/tiers.config.ts

@@ -8,17 +8,30 @@ import type { PlanConfigDocument } from '../types/system/planConfig.types';
  * what a given role (owner/admin/receptionist/assistant) can do.
  * New roles can be added by extending the ClinicRole enum and adding
  * a corresponding entry here.
+ *
+ * v2 (2026-03-31): Expanded from 23 to 40 permissions.
+ *   - providers.manage → providers.create, providers.invite, providers.edit
+ *   - staff.manage → staff.view, staff.edit, staff.invite, staff.delete, staff.viewTokens, staff.deleteTokens
+ *   - Added: clinic.create, calendar.addEvent, calendar.editEvent, calendar.deleteEvent,
+ *     appointments.reschedule, patients.viewDetails, patients.create, patients.manageTokens, billing.view
  */
 export const PERMISSION_KEYS = {
-  // Listing & profile
+  // Clinic
   'clinic.view': true,
   'clinic.edit': true,
+  'clinic.create': true,
   'reviews.view': true,
 
-  // Calendar & Appointments
+  // Calendar
   'calendar.view': true,
+  'calendar.addEvent': true,
+  'calendar.editEvent': true,
+  'calendar.deleteEvent': true,
+
+  // Appointments
   'appointments.view': true,
   'appointments.confirm': true,
+  'appointments.reschedule': true,
   'appointments.cancel': true,
 
   // Messaging
@@ -38,20 +51,31 @@ export const PERMISSION_KEYS = {
 
   // Patients
   'patients.view': true,
+  'patients.viewDetails': true,
+  'patients.create': true,
   'patients.edit': true,
+  'patients.manageTokens': true,
 
   // Providers (doctors, nurses, laser assistants, etc.)
   'providers.view': true,
-  'providers.manage': true,
+  'providers.create': true,
+  'providers.invite': true,
+  'providers.edit': true,
 
   // Analytics
   'analytics.view': true,
 
   // Staff management
-  'staff.manage': true,
+  'staff.view': true,
+  'staff.edit': true,
+  'staff.invite': true,
+  'staff.delete': true,
+  'staff.viewTokens': true,
+  'staff.deleteTokens': true,
 
   // Settings / Admin
   'settings.manage': true,
+  'billing.view': true,
   'billing.manage': true,
 } as const;
 
@@ -110,10 +134,15 @@ export const DEFAULT_ROLE_PERMISSIONS: Record<ClinicRole, Record<string, boolean
   [ClinicRole.OWNER]: {
     'clinic.view': true,
     'clinic.edit': true,
+    'clinic.create': true,
     'reviews.view': true,
     'calendar.view': true,
+    'calendar.addEvent': true,
+    'calendar.editEvent': true,
+    'calendar.deleteEvent': true,
     'appointments.view': true,
     'appointments.confirm': true,
+    'appointments.reschedule': true,
     'appointments.cancel': true,
     'messaging': true,
     'procedures.view': true,
@@ -125,21 +154,37 @@ export const DEFAULT_ROLE_PERMISSIONS: Record<ClinicRole, Record<string, boolean
     'resources.edit': true,
     'resources.delete': true,
     'patients.view': true,
+    'patients.viewDetails': true,
+    'patients.create': true,
     'patients.edit': true,
+    'patients.manageTokens': true,
     'providers.view': true,
-    'providers.manage': true,
+    'providers.create': true,
+    'providers.invite': true,
+    'providers.edit': true,
     'analytics.view': true,
-    'staff.manage': true,
+    'staff.view': true,
+    'staff.edit': true,
+    'staff.invite': true,
+    'staff.delete': true,
+    'staff.viewTokens': true,
+    'staff.deleteTokens': true,
     'settings.manage': true,
+    'billing.view': true,
     'billing.manage': true,
   },
   [ClinicRole.ADMIN]: {
     'clinic.view': true,
     'clinic.edit': true,
+    'clinic.create': false,
     'reviews.view': true,
     'calendar.view': true,
+    'calendar.addEvent': true,
+    'calendar.editEvent': true,
+    'calendar.deleteEvent': true,
     'appointments.view': true,
     'appointments.confirm': true,
+    'appointments.reschedule': true,
     'appointments.cancel': true,
     'messaging': true,
     'procedures.view': true,
@@ -151,21 +196,37 @@ export const DEFAULT_ROLE_PERMISSIONS: Record<ClinicRole, Record<string, boolean
     'resources.edit': true,
     'resources.delete': true,
     'patients.view': true,
+    'patients.viewDetails': true,
+    'patients.create': true,
     'patients.edit': true,
+    'patients.manageTokens': true,
     'providers.view': true,
-    'providers.manage': true,
+    'providers.create': true,
+    'providers.invite': true,
+    'providers.edit': true,
     'analytics.view': true,
-    'staff.manage': false,
+    'staff.view': true,
+    'staff.edit': false,
+    'staff.invite': false,
+    'staff.delete': false,
+    'staff.viewTokens': false,
+    'staff.deleteTokens': false,
     'settings.manage': true,
+    'billing.view': true,
     'billing.manage': false,
   },
   [ClinicRole.RECEPTIONIST]: {
     'clinic.view': true,
     'clinic.edit': false,
+    'clinic.create': false,
     'reviews.view': true,
     'calendar.view': true,
+    'calendar.addEvent': true,
+    'calendar.editEvent': false,
+    'calendar.deleteEvent': false,
     'appointments.view': true,
     'appointments.confirm': true,
+    'appointments.reschedule': true,
     'appointments.cancel': false,
     'messaging': true,
     'procedures.view': true,
@@ -177,21 +238,37 @@ export const DEFAULT_ROLE_PERMISSIONS: Record<ClinicRole, Record<string, boolean
     'resources.edit': false,
     'resources.delete': false,
     'patients.view': true,
+    'patients.viewDetails': true,
+    'patients.create': true,
     'patients.edit': false,
+    'patients.manageTokens': false,
     'providers.view': true,
-    'providers.manage': false,
+    'providers.create': false,
+    'providers.invite': false,
+    'providers.edit': false,
     'analytics.view': false,
-    'staff.manage': false,
+    'staff.view': false,
+    'staff.edit': false,
+    'staff.invite': false,
+    'staff.delete': false,
+    'staff.viewTokens': false,
+    'staff.deleteTokens': false,
     'settings.manage': false,
+    'billing.view': false,
     'billing.manage': false,
   },
   [ClinicRole.ASSISTANT]: {
     'clinic.view': true,
     'clinic.edit': false,
+    'clinic.create': false,
     'reviews.view': true,
     'calendar.view': true,
+    'calendar.addEvent': false,
+    'calendar.editEvent': false,
+    'calendar.deleteEvent': false,
     'appointments.view': true,
     'appointments.confirm': false,
+    'appointments.reschedule': false,
     'appointments.cancel': false,
     'messaging': false,
     'procedures.view': true,
@@ -203,12 +280,23 @@ export const DEFAULT_ROLE_PERMISSIONS: Record<ClinicRole, Record<string, boolean
     'resources.edit': false,
     'resources.delete': false,
     'patients.view': true,
+    'patients.viewDetails': false,
+    'patients.create': false,
     'patients.edit': false,
+    'patients.manageTokens': false,
     'providers.view': true,
-    'providers.manage': false,
+    'providers.create': false,
+    'providers.invite': false,
+    'providers.edit': false,
     'analytics.view': false,
-    'staff.manage': false,
+    'staff.view': false,
+    'staff.edit': false,
+    'staff.invite': false,
+    'staff.delete': false,
+    'staff.viewTokens': false,
+    'staff.deleteTokens': false,
     'settings.manage': false,
+    'billing.view': false,
     'billing.manage': false,
   },
 };
@@ -312,28 +400,44 @@ export const PERMISSION_LABELS: Record<
 > = {
   'clinic.view': { label: 'View Clinic', description: 'See clinic information and profile', category: 'Clinic' },
   'clinic.edit': { label: 'Edit Clinic', description: 'Modify clinic settings and profile', category: 'Clinic' },
+  'clinic.create': { label: 'Create Clinic', description: 'Create new clinic branches', category: 'Clinic' },
   'reviews.view': { label: 'View Reviews', description: 'See patient reviews and ratings', category: 'Clinic' },
   'calendar.view': { label: 'View Calendar', description: 'See the clinic calendar and schedules', category: 'Calendar' },
+  'calendar.addEvent': { label: 'Add Events', description: 'Create appointments and blocking events on the calendar', category: 'Calendar' },
+  'calendar.editEvent': { label: 'Edit Events', description: 'Edit blocking events on the calendar', category: 'Calendar' },
+  'calendar.deleteEvent': { label: 'Delete Events', description: 'Delete blocking events from the calendar', category: 'Calendar' },
   'appointments.view': { label: 'View Appointments', description: 'See appointment list and details', category: 'Appointments' },
-  'appointments.confirm': { label: 'Confirm Appointments', description: 'Confirm pending appointment requests', category: 'Appointments' },
+  'appointments.confirm': { label: 'Confirm Appointments', description: 'Confirm, reject, check in, and manage appointment status', category: 'Appointments' },
+  'appointments.reschedule': { label: 'Reschedule Appointments', description: 'Reschedule confirmed appointments to a new time', category: 'Appointments' },
   'appointments.cancel': { label: 'Cancel Appointments', description: 'Cancel existing appointments', category: 'Appointments' },
   'messaging': { label: 'Messaging', description: 'Send and receive messages with patients', category: 'Messaging' },
   'procedures.view': { label: 'View Procedures', description: 'See the procedures catalog', category: 'Procedures' },
-  'procedures.create': { label: 'Create Procedures', description: 'Add new procedures to the catalog', category: 'Procedures' },
+  'procedures.create': { label: 'Create Procedures', description: 'Add new procedures and assign to practitioners', category: 'Procedures' },
   'procedures.edit': { label: 'Edit Procedures', description: 'Modify existing procedures', category: 'Procedures' },
   'procedures.delete': { label: 'Delete Procedures', description: 'Remove procedures from the catalog', category: 'Procedures' },
   'resources.view': { label: 'View Resources', description: 'See clinic resources and equipment', category: 'Resources' },
   'resources.create': { label: 'Create Resources', description: 'Add new resources', category: 'Resources' },
-  'resources.edit': { label: 'Edit Resources', description: 'Modify existing resources', category: 'Resources' },
-  'resources.delete': { label: 'Delete Resources', description: 'Remove resources', category: 'Resources' },
-  'patients.view': { label: 'View Patients', description: 'See patient list and profiles', category: 'Patients' },
-  'patients.edit': { label: 'Edit Patients', description: 'Modify patient records', category: 'Patients' },
+  'resources.edit': { label: 'Edit Resources', description: 'Modify existing resources and activate instances', category: 'Resources' },
+  'resources.delete': { label: 'Delete Resources', description: 'Deactivate resources and delete instances', category: 'Resources' },
+  'patients.view': { label: 'View Patients', description: 'See patient list', category: 'Patients' },
+  'patients.viewDetails': { label: 'View Patient Details', description: 'Open patient file and detailed profile', category: 'Patients' },
+  'patients.create': { label: 'Create Patients', description: 'Add new patients', category: 'Patients' },
+  'patients.edit': { label: 'Edit Patients', description: 'Modify patient records and schedule appointments', category: 'Patients' },
+  'patients.manageTokens': { label: 'Manage Patient Tokens', description: 'Create and manage patient invitation tokens', category: 'Patients' },
   'providers.view': { label: 'View Providers', description: 'See the practitioners/providers list', category: 'Providers' },
-  'providers.manage': { label: 'Manage Providers', description: 'Add, edit, or remove providers', category: 'Providers' },
+  'providers.create': { label: 'Create Providers', description: 'Add new practitioners to the clinic', category: 'Providers' },
+  'providers.invite': { label: 'Invite Providers', description: 'Invite existing practitioners to the clinic', category: 'Providers' },
+  'providers.edit': { label: 'Edit Providers', description: 'Edit practitioner profiles and manage tokens', category: 'Providers' },
   'analytics.view': { label: 'View Analytics', description: 'Access analytics dashboards and reports', category: 'Analytics' },
-  'staff.manage': { label: 'Manage Staff', description: 'Add, remove, and assign roles to staff', category: 'Administration' },
+  'staff.view': { label: 'View Staff', description: 'See staff management page and team members', category: 'Staff Management' },
+  'staff.edit': { label: 'Edit Staff', description: 'Edit roles, permissions, and clinic assignments', category: 'Staff Management' },
+  'staff.invite': { label: 'Invite Staff', description: 'Invite new team members', category: 'Staff Management' },
+  'staff.delete': { label: 'Delete Staff', description: 'Remove team members and cancel invitations', category: 'Staff Management' },
+  'staff.viewTokens': { label: 'View Tokens', description: 'See registration tokens', category: 'Staff Management' },
+  'staff.deleteTokens': { label: 'Delete Tokens', description: 'Delete registration tokens', category: 'Staff Management' },
   'settings.manage': { label: 'Manage Settings', description: 'Modify clinic group settings', category: 'Administration' },
-  'billing.manage': { label: 'Manage Billing', description: 'Access billing, subscriptions, and payments', category: 'Administration' },
+  'billing.view': { label: 'View Billing', description: 'View subscription plans and billing history', category: 'Administration' },
+  'billing.manage': { label: 'Manage Billing', description: 'Manage subscriptions, upgrades, and payments', category: 'Administration' },
 };
 
 /** All unique permission categories in display order. */
@@ -347,6 +451,7 @@ export const PERMISSION_CATEGORIES = [
   'Patients',
   'Providers',
   'Analytics',
+  'Staff Management',
   'Administration',
 ] as const;
 

package/src/services/resource/resource.service.ts

@@ -228,34 +228,61 @@ export class ResourceService extends BaseService {
     // Handle quantity change
     if (data.quantity !== undefined && data.quantity !== existing.quantity) {
       if (data.quantity > existing.quantity) {
-        // Add new instances
+        // Increasing quantity — first reactivate inactive instances, then create new ones if needed
+        const allInstances = await this.getResourceInstances(clinicBranchId, resourceId);
+        const activeInstances = allInstances.filter(i => i.status === ResourceStatus.ACTIVE);
+        const inactiveInstances = allInstances.filter(i => i.status === ResourceStatus.INACTIVE);
+
+        const needed = data.quantity - activeInstances.length;
         const batch = writeBatch(this.db);
         const now = serverTimestamp();
         const resourceName = data.name || existing.name;
 
-        for (let i = existing.quantity + 1; i <= data.quantity; i++) {
+        let reactivated = 0;
+
+        // Step 1: Reactivate inactive instances (sorted by index, lowest first)
+        const sortedInactive = [...inactiveInstances].sort((a, b) => a.index - b.index);
+        for (const instance of sortedInactive) {
+          if (reactivated >= needed) break;
           const instanceRef = doc(
-            this.getInstancesRef(clinicBranchId, resourceId)
+            this.getInstancesRef(clinicBranchId, resourceId),
+            instance.id
           );
-          const instanceData: Omit<
-            ResourceInstance,
-            "createdAt" | "updatedAt"
-          > & { createdAt: any; updatedAt: any } = {
-            id: instanceRef.id,
-            resourceId,
-            clinicBranchId,
-            label: `${resourceName} #${i}`,
-            index: i,
+          batch.update(instanceRef, {
             status: ResourceStatus.ACTIVE,
-            createdAt: now,
             updatedAt: now,
-          };
-          batch.set(instanceRef, instanceData);
+          });
+          reactivated++;
+        }
+
+        // Step 2: Create new instances for any remaining needed
+        const remaining = needed - reactivated;
+        if (remaining > 0) {
+          // Find the highest existing index to continue numbering
+          const maxIndex = allInstances.reduce((max, i) => Math.max(max, i.index), 0);
+          for (let i = 1; i <= remaining; i++) {
+            const instanceRef = doc(
+              this.getInstancesRef(clinicBranchId, resourceId)
+            );
+            const instanceData: Omit<
+              ResourceInstance,
+              "createdAt" | "updatedAt"
+            > & { createdAt: any; updatedAt: any } = {
+              id: instanceRef.id,
+              resourceId,
+              clinicBranchId,
+              label: `${resourceName} #${maxIndex + i}`,
+              index: maxIndex + i,
+              status: ResourceStatus.ACTIVE,
+              createdAt: now,
+              updatedAt: now,
+            };
+            batch.set(instanceRef, instanceData);
+          }
         }
 
         updateData.quantity = data.quantity;
 
-        // Update resource doc in the batch too
         const resourceDocRef = this.getResourceDocRef(
           clinicBranchId,
           resourceId
@@ -337,6 +364,48 @@ export class ResourceService extends BaseService {
     });
   }
 
+  /**
+   * Hard deletes a specific instance and all its calendar events.
+   * Only works on INACTIVE instances with no future bookings.
+   */
+  async hardDeleteInstance(
+    clinicBranchId: string,
+    resourceId: string,
+    instanceId: string
+  ): Promise<void> {
+    // Verify instance exists and is inactive
+    const instanceRef = doc(
+      this.getInstancesRef(clinicBranchId, resourceId),
+      instanceId
+    );
+    const instanceSnap = await getDoc(instanceRef);
+    if (!instanceSnap.exists()) throw new Error("Instance not found");
+
+    const instance = instanceSnap.data() as ResourceInstance;
+    if (instance.status === ResourceStatus.ACTIVE) {
+      throw new Error("Cannot hard-delete an active instance. Deactivate it first.");
+    }
+
+    // Check for future bookings
+    const hasFutureBookings = await this.instanceHasFutureBookings(
+      clinicBranchId, resourceId, instanceId
+    );
+    if (hasFutureBookings) {
+      throw new Error("Cannot delete instance with future bookings.");
+    }
+
+    // Delete all calendar events for this instance
+    const calendarRef = this.getInstanceCalendarRef(
+      clinicBranchId, resourceId, instanceId
+    );
+    const calendarSnap = await getDocs(calendarRef);
+
+    const batch = writeBatch(this.db);
+    calendarSnap.docs.forEach(d => batch.delete(d.ref));
+    batch.delete(instanceRef);
+    await batch.commit();
+  }
+
   /**
    * Gets all instances for a resource
    */