@blackcode_sa/metaestetics-api 1.6.19 → 1.6.21

package/dist/index.js

@@ -1332,11 +1332,11 @@ var allergySubtypeSchema = import_zod5.z.union([
 var allergySchema = import_zod5.z.object({
   type: import_zod5.z.nativeEnum(AllergyType),
   subtype: allergySubtypeSchema,
-  name: import_zod5.z.string().optional(),
+  name: import_zod5.z.string().optional().nullable(),
   severity: import_zod5.z.enum(["mild", "moderate", "severe"]).optional(),
-  reaction: import_zod5.z.string().optional(),
-  diagnosed: timestampSchema2.optional(),
-  notes: import_zod5.z.string().optional()
+  reaction: import_zod5.z.string().optional().nullable(),
+  diagnosed: timestampSchema2.optional().nullable(),
+  notes: import_zod5.z.string().optional().nullable()
 });
 var vitalStatsSchema = import_zod5.z.object({
   height: import_zod5.z.number().positive().optional(),
@@ -1351,23 +1351,23 @@ var vitalStatsSchema = import_zod5.z.object({
 var blockingConditionSchema = import_zod5.z.object({
   condition: import_zod5.z.nativeEnum(BlockingCondition),
   diagnosedAt: timestampSchema2,
-  notes: import_zod5.z.string().optional(),
+  notes: import_zod5.z.string().optional().nullable(),
   isActive: import_zod5.z.boolean()
 });
 var contraindicationSchema = import_zod5.z.object({
   condition: import_zod5.z.nativeEnum(Contraindication),
   lastOccurrence: timestampSchema2,
   frequency: import_zod5.z.enum(["rare", "occasional", "frequent"]),
-  notes: import_zod5.z.string().optional(),
+  notes: import_zod5.z.string().optional().nullable(),
   isActive: import_zod5.z.boolean()
 });
 var medicationSchema = import_zod5.z.object({
   name: import_zod5.z.string().min(1),
   dosage: import_zod5.z.string().min(1),
   frequency: import_zod5.z.string().min(1),
-  startDate: timestampSchema2,
-  endDate: timestampSchema2.optional(),
-  prescribedBy: import_zod5.z.string().optional()
+  startDate: timestampSchema2.optional().nullable(),
+  endDate: timestampSchema2.optional().nullable(),
+  prescribedBy: import_zod5.z.string().optional().nullable()
 });
 var patientMedicalInfoSchema = import_zod5.z.object({
   patientId: import_zod5.z.string(),

package/dist/index.mjs

@@ -1149,11 +1149,11 @@ var allergySubtypeSchema = z5.union([
 var allergySchema = z5.object({
   type: z5.nativeEnum(AllergyType),
   subtype: allergySubtypeSchema,
-  name: z5.string().optional(),
+  name: z5.string().optional().nullable(),
   severity: z5.enum(["mild", "moderate", "severe"]).optional(),
-  reaction: z5.string().optional(),
-  diagnosed: timestampSchema2.optional(),
-  notes: z5.string().optional()
+  reaction: z5.string().optional().nullable(),
+  diagnosed: timestampSchema2.optional().nullable(),
+  notes: z5.string().optional().nullable()
 });
 var vitalStatsSchema = z5.object({
   height: z5.number().positive().optional(),
@@ -1168,23 +1168,23 @@ var vitalStatsSchema = z5.object({
 var blockingConditionSchema = z5.object({
   condition: z5.nativeEnum(BlockingCondition),
   diagnosedAt: timestampSchema2,
-  notes: z5.string().optional(),
+  notes: z5.string().optional().nullable(),
   isActive: z5.boolean()
 });
 var contraindicationSchema = z5.object({
   condition: z5.nativeEnum(Contraindication),
   lastOccurrence: timestampSchema2,
   frequency: z5.enum(["rare", "occasional", "frequent"]),
-  notes: z5.string().optional(),
+  notes: z5.string().optional().nullable(),
   isActive: z5.boolean()
 });
 var medicationSchema = z5.object({
   name: z5.string().min(1),
   dosage: z5.string().min(1),
   frequency: z5.string().min(1),
-  startDate: timestampSchema2,
-  endDate: timestampSchema2.optional(),
-  prescribedBy: z5.string().optional()
+  startDate: timestampSchema2.optional().nullable(),
+  endDate: timestampSchema2.optional().nullable(),
+  prescribedBy: z5.string().optional().nullable()
 });
 var patientMedicalInfoSchema = z5.object({
   patientId: z5.string(),

package/package.json

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

package/src/admin/aggregation/appointment/appointment.aggregation.service.ts

@@ -507,6 +507,8 @@ export class AppointmentAggregationService {
     try {
       const batch = this.db.batch();
       let instancesCreatedCount = 0;
+      // Store created instances for fallback direct creation if needed
+      let createdInstances = [];
 
       // Log more details about the pre-requirements
       Logger.info(
@@ -606,7 +608,8 @@ export class AppointmentAggregationService {
           return instructionObject;
         });
 
-        const newInstanceData: Omit<PatientRequirementInstance, "id"> = {
+        const newInstanceData: PatientRequirementInstance = {
+          id: newInstanceRef.id, // Add the ID to the document data
           patientId: appointment.patientId,
           appointmentId: appointment.id,
           originalRequirementId: template.id,
@@ -633,6 +636,12 @@ export class AppointmentAggregationService {
         );
 
         batch.set(newInstanceRef, newInstanceData);
+        // Store for potential fallback
+        createdInstances.push({
+          ref: newInstanceRef,
+          data: newInstanceData,
+        });
+
         instancesCreatedCount++;
         Logger.debug(
           `[AggService] Added PatientRequirementInstance ${newInstanceRef.id} to batch for template ${template.id}.`
@@ -645,12 +654,113 @@ export class AppointmentAggregationService {
           Logger.info(
             `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
           );
+
+          // Verify creation success
+          try {
+            const verifySnapshot = await this.db
+              .collection(PATIENTS_COLLECTION)
+              .doc(appointment.patientId)
+              .collection(PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME)
+              .where("appointmentId", "==", appointment.id)
+              .get();
+
+            if (verifySnapshot.empty) {
+              Logger.warn(
+                `[AggService] Batch commit reported success but documents not found! Attempting direct creation as fallback...`
+              );
+
+              // Fallback to direct creation if batch worked but docs aren't there
+              const fallbackPromises = createdInstances.map(
+                async ({ ref, data }) => {
+                  try {
+                    await ref.set(data);
+                    Logger.info(
+                      `[AggService] Fallback direct creation success for ${ref.id}`
+                    );
+                    return true;
+                  } catch (fallbackError) {
+                    Logger.error(
+                      `[AggService] Fallback direct creation failed for ${ref.id}:`,
+                      fallbackError
+                    );
+                    return false;
+                  }
+                }
+              );
+
+              const fallbackResults = await Promise.allSettled(
+                fallbackPromises
+              );
+              const successCount = fallbackResults.filter(
+                (r) => r.status === "fulfilled" && r.value === true
+              ).length;
+
+              if (successCount > 0) {
+                Logger.info(
+                  `[AggService] Fallback mechanism created ${successCount} out of ${createdInstances.length} requirements`
+                );
+              } else {
+                Logger.error(
+                  `[AggService] Both batch and fallback mechanisms failed to create requirements`
+                );
+                throw new Error(
+                  "Failed to create patient requirements through both batch and direct methods"
+                );
+              }
+            } else {
+              Logger.info(
+                `[AggService] Verification confirmed ${verifySnapshot.size} requirement documents created`
+              );
+            }
+          } catch (verifyError) {
+            Logger.error(
+              `[AggService] Error during verification of created requirements:`,
+              verifyError
+            );
+          }
         } catch (commitError) {
           Logger.error(
             `[AggService] Error committing batch for PRE_APPOINTMENT requirement instances for appointment ${appointment.id}:`,
             commitError
           );
-          throw commitError; // Re-throw to ensure the caller knows there was a problem
+
+          // Try direct creation as fallback
+          Logger.info(`[AggService] Attempting direct creation as fallback...`);
+          const fallbackPromises = createdInstances.map(
+            async ({ ref, data }) => {
+              try {
+                await ref.set(data);
+                Logger.info(
+                  `[AggService] Fallback direct creation success for ${ref.id}`
+                );
+                return true;
+              } catch (fallbackError) {
+                Logger.error(
+                  `[AggService] Fallback direct creation failed for ${ref.id}:`,
+                  fallbackError
+                );
+                return false;
+              }
+            }
+          );
+
+          const fallbackResults = await Promise.allSettled(fallbackPromises);
+          const successCount = fallbackResults.filter(
+            (r) => r.status === "fulfilled" && r.value === true
+          ).length;
+
+          if (successCount > 0) {
+            Logger.info(
+              `[AggService] Fallback mechanism created ${successCount} out of ${createdInstances.length} requirements`
+            );
+          } else {
+            Logger.error(
+              `[AggService] Both batch and fallback mechanisms failed to create requirements`
+            );
+            throw new Error(
+              "Failed to create patient requirements through both batch and direct methods"
+            );
+          }
         }
       } else {
         Logger.info(

package/src/types/patient/medical-info.types.ts

@@ -8,11 +8,11 @@ export const PATIENT_MEDICAL_INFO_COLLECTION = "medical_info";
 export interface Allergy {
   type: AllergyType;
   subtype: AllergySubtype;
-  name?: string;
-  severity?: "mild" | "moderate" | "severe";
-  reaction?: string;
-  diagnosed?: Timestamp;
-  notes?: string;
+  name?: string | null;
+  severity?: "mild" | "moderate" | "severe" | null;
+  reaction?: string | null;
+  diagnosed?: Timestamp | null;
+  notes?: string | null;
 }
 
 export interface VitalStats {
@@ -51,9 +51,9 @@ export interface PatientMedicalInfo {
     name: string;
     dosage: string;
     frequency: string;
-    startDate: Timestamp;
-    endDate?: Timestamp;
-    prescribedBy?: string;
+    startDate?: Timestamp | null;
+    endDate?: Timestamp | null;
+    prescribedBy?: string | null;
   }[];
 
   emergencyNotes?: string;
@@ -87,11 +87,11 @@ export interface UpdateVitalStatsData {
 export interface AddAllergyData {
   type: AllergyType;
   subtype: AllergySubtype;
-  name?: string;
+  name?: string | null;
   severity?: "mild" | "moderate" | "severe";
-  reaction?: string;
-  diagnosed?: Timestamp;
-  notes?: string;
+  reaction?: string | null;
+  diagnosed?: Timestamp | null;
+  notes?: string | null;
 }
 
 export interface UpdateAllergyData extends Partial<AddAllergyData> {

package/src/validations/patient/medical-info.schema.ts

@@ -21,11 +21,11 @@ export const allergySubtypeSchema = z.union([
 export const allergySchema = z.object({
   type: z.nativeEnum(AllergyType),
   subtype: allergySubtypeSchema,
-  name: z.string().optional(),
+  name: z.string().optional().nullable(),
   severity: z.enum(["mild", "moderate", "severe"]).optional(),
-  reaction: z.string().optional(),
-  diagnosed: timestampSchema.optional(),
-  notes: z.string().optional(),
+  reaction: z.string().optional().nullable(),
+  diagnosed: timestampSchema.optional().nullable(),
+  notes: z.string().optional().nullable(),
 });
 
 export const vitalStatsSchema = z.object({
@@ -46,7 +46,7 @@ export const vitalStatsSchema = z.object({
 export const blockingConditionSchema = z.object({
   condition: z.nativeEnum(BlockingCondition),
   diagnosedAt: timestampSchema,
-  notes: z.string().optional(),
+  notes: z.string().optional().nullable(),
   isActive: z.boolean(),
 });
 
@@ -54,7 +54,7 @@ export const contraindicationSchema = z.object({
   condition: z.nativeEnum(Contraindication),
   lastOccurrence: timestampSchema,
   frequency: z.enum(["rare", "occasional", "frequent"]),
-  notes: z.string().optional(),
+  notes: z.string().optional().nullable(),
   isActive: z.boolean(),
 });
 
@@ -62,9 +62,9 @@ export const medicationSchema = z.object({
   name: z.string().min(1),
   dosage: z.string().min(1),
   frequency: z.string().min(1),
-  startDate: timestampSchema,
-  endDate: timestampSchema.optional(),
-  prescribedBy: z.string().optional(),
+  startDate: timestampSchema.optional().nullable(),
+  endDate: timestampSchema.optional().nullable(),
+  prescribedBy: z.string().optional().nullable(),
 });
 
 export const patientMedicalInfoSchema = z.object({