@blackcode_sa/metaestetics-api 1.6.17 → 1.6.19

package/dist/admin/index.js

@@ -3345,18 +3345,46 @@ var AppointmentAggregationService = class {
     try {
       const batch = this.db.batch();
       let instancesCreatedCount = 0;
+      Logger.info(
+        `[AggService] Found ${appointment.preProcedureRequirements.length} pre-requirements to process: ${JSON.stringify(
+          appointment.preProcedureRequirements.map((r) => {
+            var _a2, _b;
+            return {
+              id: r.id,
+              name: r.name,
+              type: r.type,
+              isActive: r.isActive,
+              hasTimeframe: !!r.timeframe,
+              notifyAtLength: ((_b = (_a2 = r.timeframe) == null ? void 0 : _a2.notifyAt) == null ? void 0 : _b.length) || 0
+            };
+          })
+        )}`
+      );
       for (const template of appointment.preProcedureRequirements) {
-        if (!template) continue;
+        if (!template) {
+          Logger.warn(
+            `[AggService] Found null/undefined template in preProcedureRequirements array`
+          );
+          continue;
+        }
         if (template.type !== "pre" /* PRE */ || !template.isActive) {
           Logger.debug(
             `[AggService] Skipping template ${template.id} (${template.name}): not an active PRE requirement.`
           );
           continue;
         }
+        if (!template.timeframe || !template.timeframe.notifyAt || template.timeframe.notifyAt.length === 0) {
+          Logger.warn(
+            `[AggService] Template ${template.id} (${template.name}) has no timeframe.notifyAt values. Creating with empty instructions.`
+          );
+        }
         Logger.debug(
           `[AggService] Processing template ${template.id} (${template.name}) for appt ${appointment.id}`
         );
         const newInstanceRef = this.db.collection(PATIENTS_COLLECTION).doc(appointment.patientId).collection(PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME).doc();
+        Logger.debug(
+          `[AggService] Created doc reference: ${newInstanceRef.path}`
+        );
         const instructions = (((_a = template.timeframe) == null ? void 0 : _a.notifyAt) || []).map((notifyAtValue) => {
           let dueTime = appointment.appointmentStartTime;
           if (template.timeframe && typeof notifyAtValue === "number") {
@@ -3383,10 +3411,8 @@ var AppointmentAggregationService = class {
             status: "pendingNotification" /* PENDING_NOTIFICATION */,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin10.firestore.Timestamp.now(),
+            updatedAt: admin10.firestore.Timestamp.now()
             // Use current server timestamp
-            notificationId: void 0,
-            actionTakenAt: void 0
           };
           return instructionObject;
         });
@@ -3405,6 +3431,15 @@ var AppointmentAggregationService = class {
           createdAt: admin10.firestore.FieldValue.serverTimestamp(),
           updatedAt: admin10.firestore.FieldValue.serverTimestamp()
         };
+        Logger.debug(
+          `[AggService] Setting data for requirement: ${JSON.stringify({
+            id: newInstanceRef.id,
+            patientId: newInstanceData.patientId,
+            appointmentId: newInstanceData.appointmentId,
+            requirementName: newInstanceData.requirementName,
+            instructionsCount: newInstanceData.instructions.length
+          })}`
+        );
         batch.set(newInstanceRef, newInstanceData);
         instancesCreatedCount++;
         Logger.debug(
@@ -3412,10 +3447,18 @@ var AppointmentAggregationService = class {
         );
       }
       if (instancesCreatedCount > 0) {
-        await batch.commit();
-        Logger.info(
-          `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
-        );
+        try {
+          await batch.commit();
+          Logger.info(
+            `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
+          );
+        } catch (commitError) {
+          Logger.error(
+            `[AggService] Error committing batch for PRE_APPOINTMENT requirement instances for appointment ${appointment.id}:`,
+            commitError
+          );
+          throw commitError;
+        }
       } else {
         Logger.info(
           `[AggService] No new PRE_APPOINTMENT requirement instances were prepared for batch commit for appointment ${appointment.id}.`
@@ -3426,6 +3469,7 @@ var AppointmentAggregationService = class {
         `[AggService] Error creating PRE_APPOINTMENT requirement instances for appointment ${appointment.id}:`,
         error
       );
+      throw error;
     }
   }
   /**

package/dist/admin/index.mjs

@@ -3290,18 +3290,46 @@ var AppointmentAggregationService = class {
     try {
       const batch = this.db.batch();
       let instancesCreatedCount = 0;
+      Logger.info(
+        `[AggService] Found ${appointment.preProcedureRequirements.length} pre-requirements to process: ${JSON.stringify(
+          appointment.preProcedureRequirements.map((r) => {
+            var _a2, _b;
+            return {
+              id: r.id,
+              name: r.name,
+              type: r.type,
+              isActive: r.isActive,
+              hasTimeframe: !!r.timeframe,
+              notifyAtLength: ((_b = (_a2 = r.timeframe) == null ? void 0 : _a2.notifyAt) == null ? void 0 : _b.length) || 0
+            };
+          })
+        )}`
+      );
       for (const template of appointment.preProcedureRequirements) {
-        if (!template) continue;
+        if (!template) {
+          Logger.warn(
+            `[AggService] Found null/undefined template in preProcedureRequirements array`
+          );
+          continue;
+        }
         if (template.type !== "pre" /* PRE */ || !template.isActive) {
           Logger.debug(
             `[AggService] Skipping template ${template.id} (${template.name}): not an active PRE requirement.`
           );
           continue;
         }
+        if (!template.timeframe || !template.timeframe.notifyAt || template.timeframe.notifyAt.length === 0) {
+          Logger.warn(
+            `[AggService] Template ${template.id} (${template.name}) has no timeframe.notifyAt values. Creating with empty instructions.`
+          );
+        }
         Logger.debug(
           `[AggService] Processing template ${template.id} (${template.name}) for appt ${appointment.id}`
         );
         const newInstanceRef = this.db.collection(PATIENTS_COLLECTION).doc(appointment.patientId).collection(PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME).doc();
+        Logger.debug(
+          `[AggService] Created doc reference: ${newInstanceRef.path}`
+        );
         const instructions = (((_a = template.timeframe) == null ? void 0 : _a.notifyAt) || []).map((notifyAtValue) => {
           let dueTime = appointment.appointmentStartTime;
           if (template.timeframe && typeof notifyAtValue === "number") {
@@ -3328,10 +3356,8 @@ var AppointmentAggregationService = class {
             status: "pendingNotification" /* PENDING_NOTIFICATION */,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin10.firestore.Timestamp.now(),
+            updatedAt: admin10.firestore.Timestamp.now()
             // Use current server timestamp
-            notificationId: void 0,
-            actionTakenAt: void 0
           };
           return instructionObject;
         });
@@ -3350,6 +3376,15 @@ var AppointmentAggregationService = class {
           createdAt: admin10.firestore.FieldValue.serverTimestamp(),
           updatedAt: admin10.firestore.FieldValue.serverTimestamp()
         };
+        Logger.debug(
+          `[AggService] Setting data for requirement: ${JSON.stringify({
+            id: newInstanceRef.id,
+            patientId: newInstanceData.patientId,
+            appointmentId: newInstanceData.appointmentId,
+            requirementName: newInstanceData.requirementName,
+            instructionsCount: newInstanceData.instructions.length
+          })}`
+        );
         batch.set(newInstanceRef, newInstanceData);
         instancesCreatedCount++;
         Logger.debug(
@@ -3357,10 +3392,18 @@ var AppointmentAggregationService = class {
         );
       }
       if (instancesCreatedCount > 0) {
-        await batch.commit();
-        Logger.info(
-          `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
-        );
+        try {
+          await batch.commit();
+          Logger.info(
+            `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
+          );
+        } catch (commitError) {
+          Logger.error(
+            `[AggService] Error committing batch for PRE_APPOINTMENT requirement instances for appointment ${appointment.id}:`,
+            commitError
+          );
+          throw commitError;
+        }
       } else {
         Logger.info(
           `[AggService] No new PRE_APPOINTMENT requirement instances were prepared for batch commit for appointment ${appointment.id}.`
@@ -3371,6 +3414,7 @@ var AppointmentAggregationService = class {
         `[AggService] Error creating PRE_APPOINTMENT requirement instances for appointment ${appointment.id}:`,
         error
       );
+      throw error;
     }
   }
   /**

package/dist/index.d.mts

@@ -5,6 +5,7 @@ import { FirebaseApp } from 'firebase/app';
 import { Auth, User as User$1 } from 'firebase/auth';
 import { Analytics } from 'firebase/analytics';
 import { FirebaseStorage } from 'firebase/storage';
+import { Functions } from 'firebase/functions';
 
 /**
  * Review system type definitions
@@ -5042,6 +5043,8 @@ interface FirebaseInstance {
     db: Firestore;
     auth: Auth;
     analytics: Analytics | null;
+    storage: FirebaseStorage;
+    functions: Functions;
 }
 declare const initializeFirebase: (config: {
     apiKey: string;

package/dist/index.d.ts

@@ -5,6 +5,7 @@ import { FirebaseApp } from 'firebase/app';
 import { Auth, User as User$1 } from 'firebase/auth';
 import { Analytics } from 'firebase/analytics';
 import { FirebaseStorage } from 'firebase/storage';
+import { Functions } from 'firebase/functions';
 
 /**
  * Review system type definitions
@@ -5042,6 +5043,8 @@ interface FirebaseInstance {
     db: Firestore;
     auth: Auth;
     analytics: Analytics | null;
+    storage: FirebaseStorage;
+    functions: Functions;
 }
 declare const initializeFirebase: (config: {
     apiKey: string;

package/dist/index.js

@@ -705,17 +705,21 @@ var import_firestore = require("firebase/firestore");
 var import_auth = require("firebase/auth");
 var import_analytics = require("firebase/analytics");
 var import_react_native = require("react-native");
+var import_storage = require("firebase/storage");
+var import_functions = require("firebase/functions");
 var firebaseInstance = null;
 var initializeFirebase = (config) => {
   if (!firebaseInstance) {
     const app = (0, import_app.initializeApp)(config);
     const db = (0, import_firestore.getFirestore)(app);
     const auth = (0, import_auth.getAuth)(app);
+    const storage = (0, import_storage.getStorage)(app);
+    const functions = (0, import_functions.getFunctions)(app);
     let analytics = null;
     if (typeof window !== "undefined" && import_react_native.Platform.OS === "web") {
       analytics = (0, import_analytics.getAnalytics)(app);
     }
-    firebaseInstance = { app, db, auth, analytics };
+    firebaseInstance = { app, db, auth, analytics, storage, functions };
   }
   return firebaseInstance;
 };
@@ -1061,13 +1065,13 @@ var FirebaseErrorCode = /* @__PURE__ */ ((FirebaseErrorCode2) => {
 })(FirebaseErrorCode || {});
 
 // src/services/base.service.ts
-var import_storage = require("firebase/storage");
+var import_storage2 = require("firebase/storage");
 var BaseService = class {
   constructor(db, auth, app) {
     this.db = db;
     this.auth = auth;
     this.app = app;
-    this.storage = (0, import_storage.getStorage)(app);
+    this.storage = (0, import_storage2.getStorage)(app);
   }
   /**
    * Generiše jedinstveni ID za dokumente
@@ -1188,7 +1192,7 @@ var import_firestore11 = require("firebase/firestore");
 
 // src/services/patient/utils/profile.utils.ts
 var import_firestore6 = require("firebase/firestore");
-var import_storage2 = require("firebase/storage");
+var import_storage3 = require("firebase/storage");
 var import_zod8 = require("zod");
 
 // src/types/patient/medical-info.types.ts
@@ -2116,9 +2120,9 @@ var updatePatientProfileByUserRefUtil = async (db, userRef, data) => {
   }
 };
 var uploadProfilePhotoUtil = async (storage, patientId, file) => {
-  const photoRef = (0, import_storage2.ref)(storage, `patient-photos/${patientId}/profile-photo`);
-  await (0, import_storage2.uploadBytes)(photoRef, file);
-  return (0, import_storage2.getDownloadURL)(photoRef);
+  const photoRef = (0, import_storage3.ref)(storage, `patient-photos/${patientId}/profile-photo`);
+  await (0, import_storage3.uploadBytes)(photoRef, file);
+  return (0, import_storage3.getDownloadURL)(photoRef);
 };
 var updateProfilePhotoUtil = async (storage, db, patientId, file) => {
   const patientDoc = await (0, import_firestore6.getDoc)(getPatientDocRef(db, patientId));
@@ -2126,8 +2130,8 @@ var updateProfilePhotoUtil = async (storage, db, patientId, file) => {
   const patientData = patientDoc.data();
   if (patientData.profilePhoto) {
     try {
-      const oldPhotoRef = (0, import_storage2.ref)(storage, patientData.profilePhoto);
-      await (0, import_storage2.deleteObject)(oldPhotoRef);
+      const oldPhotoRef = (0, import_storage3.ref)(storage, patientData.profilePhoto);
+      await (0, import_storage3.deleteObject)(oldPhotoRef);
     } catch (error) {
       console.warn("Failed to delete old profile photo:", error);
     }
@@ -2145,8 +2149,8 @@ var deleteProfilePhotoUtil = async (storage, db, patientId) => {
   const patientData = patientDoc.data();
   if (patientData.profilePhoto) {
     try {
-      const photoRef = (0, import_storage2.ref)(storage, patientData.profilePhoto);
-      await (0, import_storage2.deleteObject)(photoRef);
+      const photoRef = (0, import_storage3.ref)(storage, patientData.profilePhoto);
+      await (0, import_storage3.deleteObject)(photoRef);
     } catch (error) {
       console.warn("Failed to delete profile photo:", error);
     }
@@ -5130,7 +5134,7 @@ var import_geofire_common3 = require("geofire-common");
 var import_zod16 = require("zod");
 
 // src/services/clinic/utils/photos.utils.ts
-var import_storage3 = require("firebase/storage");
+var import_storage4 = require("firebase/storage");
 async function uploadPhoto(photo, entityType, entityId, photoType, app, fileName) {
   if (!photo || typeof photo !== "string" || !photo.startsWith("data:")) {
     return photo;
@@ -5139,9 +5143,9 @@ async function uploadPhoto(photo, entityType, entityId, photoType, app, fileName
     console.log(
       `[PHOTO_UTILS] Uploading ${photoType} for ${entityType}/${entityId}`
     );
-    const storage = (0, import_storage3.getStorage)(app);
+    const storage = (0, import_storage4.getStorage)(app);
     const storageFileName = fileName || `${photoType}-${Date.now()}`;
-    const storageRef = (0, import_storage3.ref)(
+    const storageRef = (0, import_storage4.ref)(
       storage,
       `${entityType}/${entityId}/${storageFileName}`
     );
@@ -5153,8 +5157,8 @@ async function uploadPhoto(photo, entityType, entityId, photoType, app, fileName
       byteArrays.push(byteCharacters.charCodeAt(i));
     }
     const blob = new Blob([new Uint8Array(byteArrays)], { type: contentType });
-    await (0, import_storage3.uploadBytes)(storageRef, blob, { contentType });
-    const downloadUrl = await (0, import_storage3.getDownloadURL)(storageRef);
+    await (0, import_storage4.uploadBytes)(storageRef, blob, { contentType });
+    const downloadUrl = await (0, import_storage4.getDownloadURL)(storageRef);
     console.log(`[PHOTO_UTILS] ${photoType} uploaded successfully`, {
       downloadUrl
     });
@@ -12163,7 +12167,7 @@ var ReviewService = class extends BaseService {
 
 // src/services/appointment/appointment.service.ts
 var import_firestore40 = require("firebase/firestore");
-var import_functions = require("firebase/functions");
+var import_functions2 = require("firebase/functions");
 
 // src/services/appointment/utils/appointment.utils.ts
 var import_firestore39 = require("firebase/firestore");
@@ -12377,7 +12381,7 @@ var AppointmentService = class extends BaseService {
     this.practitionerService = practitionerService;
     this.clinicService = clinicService;
     this.filledDocumentService = filledDocumentService;
-    this.functions = (0, import_functions.getFunctions)(app, "europe-west6");
+    this.functions = (0, import_functions2.getFunctions)(app, "europe-west6");
   }
   /**
    * Gets available booking slots for a specific clinic, practitioner, and procedure using HTTP request.

package/dist/index.mjs

@@ -471,17 +471,21 @@ import { getFirestore } from "firebase/firestore";
 import { getAuth } from "firebase/auth";
 import { getAnalytics } from "firebase/analytics";
 import { Platform } from "react-native";
+import { getStorage } from "firebase/storage";
+import { getFunctions } from "firebase/functions";
 var firebaseInstance = null;
 var initializeFirebase = (config) => {
   if (!firebaseInstance) {
     const app = initializeApp(config);
     const db = getFirestore(app);
     const auth = getAuth(app);
+    const storage = getStorage(app);
+    const functions = getFunctions(app);
     let analytics = null;
     if (typeof window !== "undefined" && Platform.OS === "web") {
       analytics = getAnalytics(app);
     }
-    firebaseInstance = { app, db, auth, analytics };
+    firebaseInstance = { app, db, auth, analytics, storage, functions };
   }
   return firebaseInstance;
 };
@@ -846,13 +850,13 @@ var FirebaseErrorCode = /* @__PURE__ */ ((FirebaseErrorCode2) => {
 })(FirebaseErrorCode || {});
 
 // src/services/base.service.ts
-import { getStorage } from "firebase/storage";
+import { getStorage as getStorage2 } from "firebase/storage";
 var BaseService = class {
   constructor(db, auth, app) {
     this.db = db;
     this.auth = auth;
     this.app = app;
-    this.storage = getStorage(app);
+    this.storage = getStorage2(app);
   }
   /**
    * Generiše jedinstveni ID za dokumente
@@ -5036,7 +5040,7 @@ import { z as z16 } from "zod";
 
 // src/services/clinic/utils/photos.utils.ts
 import {
-  getStorage as getStorage2,
+  getStorage as getStorage3,
   ref as ref2,
   uploadBytes as uploadBytes2,
   getDownloadURL as getDownloadURL2,
@@ -5050,7 +5054,7 @@ async function uploadPhoto(photo, entityType, entityId, photoType, app, fileName
     console.log(
       `[PHOTO_UTILS] Uploading ${photoType} for ${entityType}/${entityId}`
     );
-    const storage = getStorage2(app);
+    const storage = getStorage3(app);
     const storageFileName = fileName || `${photoType}-${Date.now()}`;
     const storageRef = ref2(
       storage,
@@ -12258,7 +12262,7 @@ import {
   startAfter as startAfter11,
   getDocs as getDocs26
 } from "firebase/firestore";
-import { getFunctions } from "firebase/functions";
+import { getFunctions as getFunctions2 } from "firebase/functions";
 
 // src/services/appointment/utils/appointment.utils.ts
 import {
@@ -12486,7 +12490,7 @@ var AppointmentService = class extends BaseService {
     this.practitionerService = practitionerService;
     this.clinicService = clinicService;
     this.filledDocumentService = filledDocumentService;
-    this.functions = getFunctions(app, "europe-west6");
+    this.functions = getFunctions2(app, "europe-west6");
   }
   /**
    * Gets available booking slots for a specific clinic, practitioner, and procedure using HTTP request.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.6.17",
+  "version": "1.6.19",
   "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

@@ -508,8 +508,29 @@ export class AppointmentAggregationService {
       const batch = this.db.batch();
       let instancesCreatedCount = 0;
 
+      // Log more details about the pre-requirements
+      Logger.info(
+        `[AggService] Found ${
+          appointment.preProcedureRequirements.length
+        } pre-requirements to process: ${JSON.stringify(
+          appointment.preProcedureRequirements.map((r) => ({
+            id: r.id,
+            name: r.name,
+            type: r.type,
+            isActive: r.isActive,
+            hasTimeframe: !!r.timeframe,
+            notifyAtLength: r.timeframe?.notifyAt?.length || 0,
+          }))
+        )}`
+      );
+
       for (const template of appointment.preProcedureRequirements) {
-        if (!template) continue; // Skip if template is null or undefined in the array
+        if (!template) {
+          Logger.warn(
+            `[AggService] Found null/undefined template in preProcedureRequirements array`
+          );
+          continue;
+        }
 
         // Ensure it's an active, PRE-type requirement
         if (template.type !== RequirementType.PRE || !template.isActive) {
@@ -519,6 +540,16 @@ export class AppointmentAggregationService {
           continue;
         }
 
+        if (
+          !template.timeframe ||
+          !template.timeframe.notifyAt ||
+          template.timeframe.notifyAt.length === 0
+        ) {
+          Logger.warn(
+            `[AggService] Template ${template.id} (${template.name}) has no timeframe.notifyAt values. Creating with empty instructions.`
+          );
+        }
+
         Logger.debug(
           `[AggService] Processing template ${template.id} (${template.name}) for appt ${appointment.id}`
         );
@@ -529,6 +560,11 @@ export class AppointmentAggregationService {
           .collection(PATIENT_REQUIREMENTS_SUBCOLLECTION_NAME)
           .doc(); // Auto-generate ID for the new instance
 
+        // Log the path for debugging
+        Logger.debug(
+          `[AggService] Created doc reference: ${newInstanceRef.path}`
+        );
+
         const instructions: PatientRequirementInstruction[] = (
           template.timeframe?.notifyAt || []
         ).map((notifyAtValue) => {
@@ -566,8 +602,6 @@ export class AppointmentAggregationService {
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
             updatedAt: admin.firestore.Timestamp.now() as any, // Use current server timestamp
-            notificationId: undefined,
-            actionTakenAt: undefined,
           };
           return instructionObject;
         });
@@ -587,6 +621,17 @@ export class AppointmentAggregationService {
           updatedAt: admin.firestore.FieldValue.serverTimestamp() as any,
         };
 
+        // Log the data being set
+        Logger.debug(
+          `[AggService] Setting data for requirement: ${JSON.stringify({
+            id: newInstanceRef.id,
+            patientId: newInstanceData.patientId,
+            appointmentId: newInstanceData.appointmentId,
+            requirementName: newInstanceData.requirementName,
+            instructionsCount: newInstanceData.instructions.length,
+          })}`
+        );
+
         batch.set(newInstanceRef, newInstanceData);
         instancesCreatedCount++;
         Logger.debug(
@@ -595,10 +640,18 @@ export class AppointmentAggregationService {
       }
 
       if (instancesCreatedCount > 0) {
-        await batch.commit();
-        Logger.info(
-          `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
-        );
+        try {
+          await batch.commit();
+          Logger.info(
+            `[AggService] Successfully created ${instancesCreatedCount} PRE_APPOINTMENT requirement instances for appointment ${appointment.id}.`
+          );
+        } 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
+        }
       } else {
         Logger.info(
           `[AggService] No new PRE_APPOINTMENT requirement instances were prepared for batch commit for appointment ${appointment.id}.`
@@ -609,8 +662,7 @@ export class AppointmentAggregationService {
         `[AggService] Error creating PRE_APPOINTMENT requirement instances for appointment ${appointment.id}:`,
         error
       );
-      // Rethrow or handle as per error policy, e.g., if this failure should halt further processing.
-      // For now, just logging.
+      throw error; // Re-throw to ensure the caller knows there was a problem
     }
   }