@blackcode_sa/metaestetics-api 1.6.0 → 1.6.1

package/dist/index.js

@@ -3928,8 +3928,8 @@ var PractitionerService = class extends BaseService {
       if (!clinic) {
         throw new Error(`Clinic ${clinicId} not found`);
       }
-      const clinics = data.clinics || [clinicId];
-      if (data.clinics) {
+      const clinicsToAdd = /* @__PURE__ */ new Set([clinicId]);
+      if (data.clinics && data.clinics.length > 0) {
         for (const cId of data.clinics) {
           if (cId !== clinicId) {
             const otherClinic = await this.getClinicService().getClinic(cId);
@@ -3937,8 +3937,10 @@ var PractitionerService = class extends BaseService {
               throw new Error(`Clinic ${cId} not found`);
             }
           }
+          clinicsToAdd.add(cId);
         }
       }
+      const clinics = Array.from(clinicsToAdd);
       const defaultReviewInfo = {
         totalReviews: 0,
         averageRating: 0,
@@ -3950,7 +3952,21 @@ var PractitionerService = class extends BaseService {
         recommendationPercentage: 0
       };
       const practitionerId = this.generateId();
-      const clinicsInfo = validatedData.clinicsInfo || [];
+      const clinicsInfo = [];
+      for (const cId of clinics) {
+        const clinicData = await this.getClinicService().getClinic(cId);
+        if (clinicData) {
+          clinicsInfo.push({
+            id: clinicData.id,
+            name: clinicData.name,
+            location: clinicData.location,
+            contactInfo: clinicData.contactInfo,
+            featuredPhoto: clinicData.coverPhoto || "",
+            description: clinicData.description || null
+          });
+        }
+      }
+      const finalClinicsInfo = validatedData.clinicsInfo && validatedData.clinicsInfo.length > 0 ? validatedData.clinicsInfo : clinicsInfo;
       const proceduresInfo = [];
       const practitionerData = {
         id: practitionerId,
@@ -3960,7 +3976,7 @@ var PractitionerService = class extends BaseService {
         certification: validatedData.certification,
         clinics,
         clinicWorkingHours: validatedData.clinicWorkingHours || [],
-        clinicsInfo,
+        clinicsInfo: finalClinicsInfo,
         procedures: [],
         proceduresInfo,
         reviewInfo: defaultReviewInfo,

package/dist/index.mjs

@@ -3829,8 +3829,8 @@ var PractitionerService = class extends BaseService {
       if (!clinic) {
         throw new Error(`Clinic ${clinicId} not found`);
       }
-      const clinics = data.clinics || [clinicId];
-      if (data.clinics) {
+      const clinicsToAdd = /* @__PURE__ */ new Set([clinicId]);
+      if (data.clinics && data.clinics.length > 0) {
         for (const cId of data.clinics) {
           if (cId !== clinicId) {
             const otherClinic = await this.getClinicService().getClinic(cId);
@@ -3838,8 +3838,10 @@ var PractitionerService = class extends BaseService {
               throw new Error(`Clinic ${cId} not found`);
             }
           }
+          clinicsToAdd.add(cId);
         }
       }
+      const clinics = Array.from(clinicsToAdd);
       const defaultReviewInfo = {
         totalReviews: 0,
         averageRating: 0,
@@ -3851,7 +3853,21 @@ var PractitionerService = class extends BaseService {
         recommendationPercentage: 0
       };
       const practitionerId = this.generateId();
-      const clinicsInfo = validatedData.clinicsInfo || [];
+      const clinicsInfo = [];
+      for (const cId of clinics) {
+        const clinicData = await this.getClinicService().getClinic(cId);
+        if (clinicData) {
+          clinicsInfo.push({
+            id: clinicData.id,
+            name: clinicData.name,
+            location: clinicData.location,
+            contactInfo: clinicData.contactInfo,
+            featuredPhoto: clinicData.coverPhoto || "",
+            description: clinicData.description || null
+          });
+        }
+      }
+      const finalClinicsInfo = validatedData.clinicsInfo && validatedData.clinicsInfo.length > 0 ? validatedData.clinicsInfo : clinicsInfo;
       const proceduresInfo = [];
       const practitionerData = {
         id: practitionerId,
@@ -3861,7 +3877,7 @@ var PractitionerService = class extends BaseService {
         certification: validatedData.certification,
         clinics,
         clinicWorkingHours: validatedData.clinicWorkingHours || [],
-        clinicsInfo,
+        clinicsInfo: finalClinicsInfo,
         procedures: [],
         proceduresInfo,
         reviewInfo: defaultReviewInfo,

package/package.json

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

package/src/services/practitioner/practitioner.service.ts

@@ -176,21 +176,28 @@ export class PractitionerService extends BaseService {
         throw new Error(`Clinic ${clinicId} not found`);
       }
 
-      // Priprema podataka za kreiranje profila
-      const clinics = data.clinics || [clinicId];
+      // Make sure the primary clinic (clinicId) is always included
+      // Merge the clinics array with the primary clinicId, avoiding duplicates
+      const clinicsToAdd = new Set<string>([clinicId]);
 
-      // Provera da li sve dodatno navedene klinike postoje
-      if (data.clinics) {
+      // Add additional clinics if provided
+      if (data.clinics && data.clinics.length > 0) {
         for (const cId of data.clinics) {
+          // Verify each additional clinic exists
           if (cId !== clinicId) {
+            // Skip checking the primary clinic again
             const otherClinic = await this.getClinicService().getClinic(cId);
             if (!otherClinic) {
               throw new Error(`Clinic ${cId} not found`);
             }
           }
+          clinicsToAdd.add(cId);
         }
       }
 
+      // Convert Set to Array
+      const clinics = Array.from(clinicsToAdd);
+
       // Initialize default review info for new practitioners
       const defaultReviewInfo: PractitionerReviewInfo = {
         totalReviews: 0,
@@ -206,7 +213,30 @@ export class PractitionerService extends BaseService {
       // Generate ID for the new practitioner
       const practitionerId = this.generateId();
 
-      const clinicsInfo = validatedData.clinicsInfo || [];
+      // Create clinicsInfo from the merged clinics array
+      const clinicsInfo: ClinicInfo[] = [];
+
+      // Populate clinicsInfo for each clinic
+      for (const cId of clinics) {
+        const clinicData = await this.getClinicService().getClinic(cId);
+        if (clinicData) {
+          clinicsInfo.push({
+            id: clinicData.id,
+            name: clinicData.name,
+            location: clinicData.location,
+            contactInfo: clinicData.contactInfo,
+            featuredPhoto: clinicData.coverPhoto || "",
+            description: clinicData.description || null,
+          });
+        }
+      }
+
+      // Use provided clinicsInfo if available, otherwise use the ones we just created
+      const finalClinicsInfo =
+        validatedData.clinicsInfo && validatedData.clinicsInfo.length > 0
+          ? validatedData.clinicsInfo
+          : clinicsInfo;
+
       const proceduresInfo: ProcedureSummaryInfo[] = [];
 
       const practitionerData: Omit<Practitioner, "createdAt" | "updatedAt"> & {
@@ -219,7 +249,7 @@ export class PractitionerService extends BaseService {
         certification: validatedData.certification,
         clinics: clinics,
         clinicWorkingHours: validatedData.clinicWorkingHours || [],
-        clinicsInfo: clinicsInfo,
+        clinicsInfo: finalClinicsInfo,
         procedures: [],
         proceduresInfo: proceduresInfo,
         reviewInfo: defaultReviewInfo,