@blackcode_sa/metaestetics-api 1.15.17-staging.6 → 1.15.17-staging.8

package/dist/index.d.mts

@@ -10113,6 +10113,11 @@ declare class ResourceService extends BaseService {
      * Soft deletes a resource by setting status to INACTIVE
      */
     deleteResource(clinicBranchId: string, resourceId: string): Promise<void>;
+    /**
+     * Hard deletes a specific instance and all its calendar events.
+     * Only works on INACTIVE instances with no future bookings.
+     */
+    hardDeleteInstance(clinicBranchId: string, resourceId: string, instanceId: string): Promise<void>;
     /**
      * Gets all instances for a resource
      */

package/dist/index.d.ts

@@ -10113,6 +10113,11 @@ declare class ResourceService extends BaseService {
      * Soft deletes a resource by setting status to INACTIVE
      */
     deleteResource(clinicBranchId: string, resourceId: string): Promise<void>;
+    /**
+     * Hard deletes a specific instance and all its calendar events.
+     * Only works on INACTIVE instances with no future bookings.
+     */
+    hardDeleteInstance(clinicBranchId: string, resourceId: string, instanceId: string): Promise<void>;
     /**
      * Gets all instances for a resource
      */

package/dist/index.js

@@ -10542,7 +10542,7 @@ var removeMedicationUtil = async (db, patientId, medicationIndex, requesterId, r
 // src/services/patient/utils/profile.utils.ts
 var import_firestore26 = require("firebase/firestore");
 var import_zod13 = require("zod");
-var createPatientProfileUtil = async (db, data, generateId2) => {
+var createPatientProfileUtil = async (db, data, generateId) => {
   var _a, _b;
   try {
     console.log("[createPatientProfileUtil] Starting patient profile creation");
@@ -10552,7 +10552,7 @@ var createPatientProfileUtil = async (db, data, generateId2) => {
         "userRef is required to create a standard patient profile."
       );
     }
-    const patientId = generateId2();
+    const patientId = generateId();
     console.log(`[createPatientProfileUtil] Generated patientId: ${patientId}`);
     const patientData = {
       id: patientId,
@@ -10886,7 +10886,7 @@ var createPatientTokenSchema = import_zod14.z.object({
 });
 
 // src/services/patient/utils/token.utils.ts
-var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
+var createPatientTokenUtil = async (db, data, createdBy, generateId) => {
   var _a;
   const validatedData = createPatientTokenSchema.parse(data);
   const patientRef = getPatientDocRef(db, validatedData.patientId);
@@ -10897,9 +10897,9 @@ var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
     );
   }
   const expiration = validatedData.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3);
-  const tokenString = generateId2().slice(0, 6).toUpperCase();
+  const tokenString = generateId().slice(0, 6).toUpperCase();
   const token = {
-    id: generateId2(),
+    id: generateId(),
     token: tokenString,
     patientId: validatedData.patientId,
     email: validatedData.email,
@@ -15637,14 +15637,12 @@ async function uploadMultiplePhotos(photos, entityType, entityId, photoType, app
 }
 
 // src/services/clinic/utils/clinic-group.utils.ts
-function generateId() {
-  const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  const timestamp = Date.now().toString(36);
-  const randomPart = Array.from(
-    { length: 12 },
+function generateTokenCode() {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  return Array.from(
+    { length: 6 },
     () => chars.charAt(Math.floor(Math.random() * chars.length))
   ).join("");
-  return `${randomPart}-${timestamp}`;
 }
 async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdminService, app) {
   console.log("[CLINIC_GROUP] Starting clinic group creation", {
@@ -15936,7 +15934,7 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
   const tokenRef = (0, import_firestore41.doc)(adminTokensRef(db, groupId));
   const token = {
     id: tokenRef.id,
-    token: generateId(),
+    token: generateTokenCode(),
     status: "active" /* ACTIVE */,
     email,
     clinicGroupId: groupId,
@@ -18682,8 +18680,8 @@ function getClinicSyncedCalendarDocRef(db, clinicId, syncedCalendarId) {
 }
 
 // src/services/calendar/utils/clinic.utils.ts
-async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getClinicCalendarEventDocRef(db, clinicId, eventId);
   const newEvent = {
     id: eventId,
@@ -18733,8 +18731,8 @@ async function checkAutoConfirmAppointmentsUtil(db, clinicId) {
 
 // src/services/calendar/utils/patient.utils.ts
 var import_firestore49 = require("firebase/firestore");
-async function createPatientCalendarEventUtil(db, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPatientCalendarEventUtil(db, patientId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPatientCalendarEventDocRef(db, patientId, eventId);
   const newEvent = {
     id: eventId,
@@ -18765,8 +18763,8 @@ async function updatePatientCalendarEventUtil(db, patientId, eventId, updateData
 
 // src/services/calendar/utils/practitioner.utils.ts
 var import_firestore50 = require("firebase/firestore");
-async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPractitionerCalendarEventDocRef(
     db,
     practitionerId,
@@ -18804,8 +18802,8 @@ async function updatePractitionerCalendarEventUtil(db, practitionerId, eventId,
 }
 
 // src/services/calendar/utils/appointment.utils.ts
-async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId) {
+  const eventId = generateId();
   const autoConfirm = await checkAutoConfirmAppointmentsUtil(db, clinicId);
   const initialStatus = autoConfirm ? "confirmed" /* CONFIRMED */ : "pending" /* PENDING */;
   const appointmentData = {
@@ -18971,8 +18969,8 @@ async function searchCalendarEventsUtil(db, params) {
 
 // src/services/calendar/utils/synced-calendar.utils.ts
 var import_firestore52 = require("firebase/firestore");
-async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPractitionerSyncedCalendarDocRef(
     db,
     practitionerId,
@@ -18991,8 +18989,8 @@ async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendar
     updatedAt: import_firestore52.Timestamp.now()
   };
 }
-async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
   const newCalendar = {
     id: calendarId,
@@ -19007,8 +19005,8 @@ async function createPatientSyncedCalendarUtil(db, patientId, calendarData, gene
     updatedAt: import_firestore52.Timestamp.now()
   };
 }
-async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
   const newCalendar = {
     id: calendarId,
@@ -25153,24 +25151,46 @@ var ResourceService = class extends BaseService {
     if (data.status !== void 0) updateData.status = data.status;
     if (data.quantity !== void 0 && data.quantity !== existing.quantity) {
       if (data.quantity > existing.quantity) {
+        const allInstances = await this.getResourceInstances(clinicBranchId, resourceId);
+        const activeInstances = allInstances.filter((i) => i.status === "active" /* ACTIVE */);
+        const inactiveInstances = allInstances.filter((i) => i.status === "inactive" /* INACTIVE */);
+        const needed = data.quantity - activeInstances.length;
         const batch = (0, import_firestore65.writeBatch)(this.db);
         const now = (0, import_firestore65.serverTimestamp)();
         const resourceName = data.name || existing.name;
-        for (let i = existing.quantity + 1; i <= data.quantity; i++) {
+        let reactivated = 0;
+        const sortedInactive = [...inactiveInstances].sort((a, b) => a.index - b.index);
+        for (const instance of sortedInactive) {
+          if (reactivated >= needed) break;
           const instanceRef = (0, import_firestore65.doc)(
-            this.getInstancesRef(clinicBranchId, resourceId)
+            this.getInstancesRef(clinicBranchId, resourceId),
+            instance.id
           );
-          const instanceData = {
-            id: instanceRef.id,
-            resourceId,
-            clinicBranchId,
-            label: `${resourceName} #${i}`,
-            index: i,
+          batch.update(instanceRef, {
             status: "active" /* ACTIVE */,
-            createdAt: now,
             updatedAt: now
-          };
-          batch.set(instanceRef, instanceData);
+          });
+          reactivated++;
+        }
+        const remaining = needed - reactivated;
+        if (remaining > 0) {
+          const maxIndex = allInstances.reduce((max, i) => Math.max(max, i.index), 0);
+          for (let i = 1; i <= remaining; i++) {
+            const instanceRef = (0, import_firestore65.doc)(
+              this.getInstancesRef(clinicBranchId, resourceId)
+            );
+            const instanceData = {
+              id: instanceRef.id,
+              resourceId,
+              clinicBranchId,
+              label: `${resourceName} #${maxIndex + i}`,
+              index: maxIndex + i,
+              status: "active" /* ACTIVE */,
+              createdAt: now,
+              updatedAt: now
+            };
+            batch.set(instanceRef, instanceData);
+          }
         }
         updateData.quantity = data.quantity;
         const resourceDocRef2 = this.getResourceDocRef(
@@ -25237,6 +25257,40 @@ var ResourceService = class extends BaseService {
       status: "inactive" /* INACTIVE */
     });
   }
+  /**
+   * Hard deletes a specific instance and all its calendar events.
+   * Only works on INACTIVE instances with no future bookings.
+   */
+  async hardDeleteInstance(clinicBranchId, resourceId, instanceId) {
+    const instanceRef = (0, import_firestore65.doc)(
+      this.getInstancesRef(clinicBranchId, resourceId),
+      instanceId
+    );
+    const instanceSnap = await (0, import_firestore65.getDoc)(instanceRef);
+    if (!instanceSnap.exists()) throw new Error("Instance not found");
+    const instance = instanceSnap.data();
+    if (instance.status === "active" /* ACTIVE */) {
+      throw new Error("Cannot hard-delete an active instance. Deactivate it first.");
+    }
+    const hasFutureBookings = await this.instanceHasFutureBookings(
+      clinicBranchId,
+      resourceId,
+      instanceId
+    );
+    if (hasFutureBookings) {
+      throw new Error("Cannot delete instance with future bookings.");
+    }
+    const calendarRef = this.getInstanceCalendarRef(
+      clinicBranchId,
+      resourceId,
+      instanceId
+    );
+    const calendarSnap = await (0, import_firestore65.getDocs)(calendarRef);
+    const batch = (0, import_firestore65.writeBatch)(this.db);
+    calendarSnap.docs.forEach((d) => batch.delete(d.ref));
+    batch.delete(instanceRef);
+    await batch.commit();
+  }
   /**
    * Gets all instances for a resource
    */

package/dist/index.mjs

@@ -10509,7 +10509,7 @@ import {
   doc as doc16
 } from "firebase/firestore";
 import { z as z13 } from "zod";
-var createPatientProfileUtil = async (db, data, generateId2) => {
+var createPatientProfileUtil = async (db, data, generateId) => {
   var _a, _b;
   try {
     console.log("[createPatientProfileUtil] Starting patient profile creation");
@@ -10519,7 +10519,7 @@ var createPatientProfileUtil = async (db, data, generateId2) => {
         "userRef is required to create a standard patient profile."
       );
     }
-    const patientId = generateId2();
+    const patientId = generateId();
     console.log(`[createPatientProfileUtil] Generated patientId: ${patientId}`);
     const patientData = {
       id: patientId,
@@ -10864,7 +10864,7 @@ var createPatientTokenSchema = z14.object({
 });
 
 // src/services/patient/utils/token.utils.ts
-var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
+var createPatientTokenUtil = async (db, data, createdBy, generateId) => {
   var _a;
   const validatedData = createPatientTokenSchema.parse(data);
   const patientRef = getPatientDocRef(db, validatedData.patientId);
@@ -10875,9 +10875,9 @@ var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
     );
   }
   const expiration = validatedData.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3);
-  const tokenString = generateId2().slice(0, 6).toUpperCase();
+  const tokenString = generateId().slice(0, 6).toUpperCase();
   const token = {
-    id: generateId2(),
+    id: generateId(),
     token: tokenString,
     patientId: validatedData.patientId,
     email: validatedData.email,
@@ -15666,14 +15666,12 @@ async function uploadMultiplePhotos(photos, entityType, entityId, photoType, app
 }
 
 // src/services/clinic/utils/clinic-group.utils.ts
-function generateId() {
-  const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  const timestamp = Date.now().toString(36);
-  const randomPart = Array.from(
-    { length: 12 },
+function generateTokenCode() {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  return Array.from(
+    { length: 6 },
     () => chars.charAt(Math.floor(Math.random() * chars.length))
   ).join("");
-  return `${randomPart}-${timestamp}`;
 }
 async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdminService, app) {
   console.log("[CLINIC_GROUP] Starting clinic group creation", {
@@ -15965,7 +15963,7 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
   const tokenRef = doc28(adminTokensRef(db, groupId));
   const token = {
     id: tokenRef.id,
-    token: generateId(),
+    token: generateTokenCode(),
     status: "active" /* ACTIVE */,
     email,
     clinicGroupId: groupId,
@@ -18773,8 +18771,8 @@ function getClinicSyncedCalendarDocRef(db, clinicId, syncedCalendarId) {
 }
 
 // src/services/calendar/utils/clinic.utils.ts
-async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getClinicCalendarEventDocRef(db, clinicId, eventId);
   const newEvent = {
     id: eventId,
@@ -18836,8 +18834,8 @@ import {
   Timestamp as Timestamp25,
   serverTimestamp as serverTimestamp26
 } from "firebase/firestore";
-async function createPatientCalendarEventUtil(db, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPatientCalendarEventUtil(db, patientId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPatientCalendarEventDocRef(db, patientId, eventId);
   const newEvent = {
     id: eventId,
@@ -18880,8 +18878,8 @@ import {
   Timestamp as Timestamp26,
   serverTimestamp as serverTimestamp27
 } from "firebase/firestore";
-async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPractitionerCalendarEventDocRef(
     db,
     practitionerId,
@@ -18919,8 +18917,8 @@ async function updatePractitionerCalendarEventUtil(db, practitionerId, eventId,
 }
 
 // src/services/calendar/utils/appointment.utils.ts
-async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId) {
+  const eventId = generateId();
   const autoConfirm = await checkAutoConfirmAppointmentsUtil(db, clinicId);
   const initialStatus = autoConfirm ? "confirmed" /* CONFIRMED */ : "pending" /* PENDING */;
   const appointmentData = {
@@ -19110,8 +19108,8 @@ import {
   Timestamp as Timestamp28,
   serverTimestamp as serverTimestamp29
 } from "firebase/firestore";
-async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPractitionerSyncedCalendarDocRef(
     db,
     practitionerId,
@@ -19130,8 +19128,8 @@ async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendar
     updatedAt: Timestamp28.now()
   };
 }
-async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
   const newCalendar = {
     id: calendarId,
@@ -19146,8 +19144,8 @@ async function createPatientSyncedCalendarUtil(db, patientId, calendarData, gene
     updatedAt: Timestamp28.now()
   };
 }
-async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
   const newCalendar = {
     id: calendarId,
@@ -25386,24 +25384,46 @@ var ResourceService = class extends BaseService {
     if (data.status !== void 0) updateData.status = data.status;
     if (data.quantity !== void 0 && data.quantity !== existing.quantity) {
       if (data.quantity > existing.quantity) {
+        const allInstances = await this.getResourceInstances(clinicBranchId, resourceId);
+        const activeInstances = allInstances.filter((i) => i.status === "active" /* ACTIVE */);
+        const inactiveInstances = allInstances.filter((i) => i.status === "inactive" /* INACTIVE */);
+        const needed = data.quantity - activeInstances.length;
         const batch = writeBatch7(this.db);
         const now = serverTimestamp36();
         const resourceName = data.name || existing.name;
-        for (let i = existing.quantity + 1; i <= data.quantity; i++) {
+        let reactivated = 0;
+        const sortedInactive = [...inactiveInstances].sort((a, b) => a.index - b.index);
+        for (const instance of sortedInactive) {
+          if (reactivated >= needed) break;
           const instanceRef = doc46(
-            this.getInstancesRef(clinicBranchId, resourceId)
+            this.getInstancesRef(clinicBranchId, resourceId),
+            instance.id
           );
-          const instanceData = {
-            id: instanceRef.id,
-            resourceId,
-            clinicBranchId,
-            label: `${resourceName} #${i}`,
-            index: i,
+          batch.update(instanceRef, {
             status: "active" /* ACTIVE */,
-            createdAt: now,
             updatedAt: now
-          };
-          batch.set(instanceRef, instanceData);
+          });
+          reactivated++;
+        }
+        const remaining = needed - reactivated;
+        if (remaining > 0) {
+          const maxIndex = allInstances.reduce((max, i) => Math.max(max, i.index), 0);
+          for (let i = 1; i <= remaining; i++) {
+            const instanceRef = doc46(
+              this.getInstancesRef(clinicBranchId, resourceId)
+            );
+            const instanceData = {
+              id: instanceRef.id,
+              resourceId,
+              clinicBranchId,
+              label: `${resourceName} #${maxIndex + i}`,
+              index: maxIndex + i,
+              status: "active" /* ACTIVE */,
+              createdAt: now,
+              updatedAt: now
+            };
+            batch.set(instanceRef, instanceData);
+          }
         }
         updateData.quantity = data.quantity;
         const resourceDocRef2 = this.getResourceDocRef(
@@ -25470,6 +25490,40 @@ var ResourceService = class extends BaseService {
       status: "inactive" /* INACTIVE */
     });
   }
+  /**
+   * Hard deletes a specific instance and all its calendar events.
+   * Only works on INACTIVE instances with no future bookings.
+   */
+  async hardDeleteInstance(clinicBranchId, resourceId, instanceId) {
+    const instanceRef = doc46(
+      this.getInstancesRef(clinicBranchId, resourceId),
+      instanceId
+    );
+    const instanceSnap = await getDoc47(instanceRef);
+    if (!instanceSnap.exists()) throw new Error("Instance not found");
+    const instance = instanceSnap.data();
+    if (instance.status === "active" /* ACTIVE */) {
+      throw new Error("Cannot hard-delete an active instance. Deactivate it first.");
+    }
+    const hasFutureBookings = await this.instanceHasFutureBookings(
+      clinicBranchId,
+      resourceId,
+      instanceId
+    );
+    if (hasFutureBookings) {
+      throw new Error("Cannot delete instance with future bookings.");
+    }
+    const calendarRef = this.getInstanceCalendarRef(
+      clinicBranchId,
+      resourceId,
+      instanceId
+    );
+    const calendarSnap = await getDocs35(calendarRef);
+    const batch = writeBatch7(this.db);
+    calendarSnap.docs.forEach((d) => batch.delete(d.ref));
+    batch.delete(instanceRef);
+    await batch.commit();
+  }
   /**
    * Gets all instances for a resource
    */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.15.17-staging.6",
+  "version": "1.15.17-staging.8",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/services/clinic/utils/clinic-group.utils.ts

@@ -50,6 +50,18 @@ function generateId(): string {
   return `${randomPart}-${timestamp}`;
 }
 
+/**
+ * Generates a short 6-character uppercase alphanumeric token code.
+ * Used for admin registration tokens — easy to read, type, and share.
+ * 36^6 = ~2.1 billion combinations, collision risk negligible for active tokens.
+ */
+function generateTokenCode(): string {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789"; // no I/1/O/0 to avoid confusion
+  return Array.from({ length: 6 }, () =>
+    chars.charAt(Math.floor(Math.random() * chars.length))
+  ).join("");
+}
+
 /**
  * Creates a new clinic group
  * @param db - Firestore database instance
@@ -502,7 +514,7 @@ export async function createAdminToken(
   const tokenRef = doc(adminTokensRef(db, groupId));
   const token: AdminToken = {
     id: tokenRef.id,
-    token: generateId(),
+    token: generateTokenCode(),
     status: AdminTokenStatus.ACTIVE,
     email,
     clinicGroupId: groupId,

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
    */