@blackcode_sa/metaestetics-api 1.6.0 → 1.6.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.6.0",
+  "version": "1.6.2",
   "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,35 @@ 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) {
+          // Ensure we're creating a ClinicInfo object that matches the interface structure
+          clinicsInfo.push({
+            id: clinicData.id,
+            name: clinicData.name,
+            location: clinicData.location,
+            contactInfo: clinicData.contactInfo,
+            // Make sure we're using the right property for featuredPhoto
+            featuredPhoto:
+              clinicData.featuredPhotos && clinicData.featuredPhotos.length > 0
+                ? clinicData.featuredPhotos[0]
+                : 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 +254,7 @@ export class PractitionerService extends BaseService {
         certification: validatedData.certification,
         clinics: clinics,
         clinicWorkingHours: validatedData.clinicWorkingHours || [],
-        clinicsInfo: clinicsInfo,
+        clinicsInfo: finalClinicsInfo,
         procedures: [],
         proceduresInfo: proceduresInfo,
         reviewInfo: defaultReviewInfo,

package/src/validations/clinic.schema.ts

@@ -13,8 +13,12 @@ import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
-import { procedureSummaryInfoSchema } from "./practitioner.schema";
 import { clinicReviewInfoSchema } from "./reviews.schema";
+import {
+  procedureSummaryInfoSchema,
+  clinicInfoSchema,
+  doctorInfoSchema,
+} from "./shared.schema";
 
 /**
  * Validaciona šema za kontakt informacije
@@ -92,30 +96,6 @@ export const adminInfoSchema = z.object({
   email: z.string().email(),
 });
 
-/**
- * Validaciona šema za osnovne informacije o klinici (for aggregation)
- */
-export const clinicInfoSchema = z.object({
-  id: z.string(),
-  featuredPhoto: z.string(),
-  name: z.string(),
-  description: z.string().nullable().optional(),
-  location: clinicLocationSchema,
-  contactInfo: clinicContactInfoSchema,
-});
-
-/**
- * Validaciona šema za informacije o doktoru (for aggregation in Clinic)
- */
-export const doctorInfoSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  description: z.string().nullable().optional(),
-  photo: z.string(),
-  rating: z.number().min(0).max(5),
-  services: z.array(z.string()), // List of procedure IDs practitioner offers
-});
-
 /**
  * @deprecated Replaced by procedureSummaryInfoSchema.
  * Validaciona šema za informacije o usluzi (Old aggregation schema)

package/src/validations/practitioner.schema.ts

@@ -9,12 +9,12 @@ import {
   PractitionerTokenStatus,
 } from "../types/practitioner";
 import { practitionerReviewInfoSchema } from "./reviews.schema";
-import { clinicInfoSchema } from "./clinic.schema";
 import { ProcedureFamily } from "../backoffice/types/static/procedure-family.types";
 import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
+import { clinicInfoSchema, procedureSummaryInfoSchema } from "./shared.schema";
 
 /**
  * Šema za validaciju osnovnih informacija o zdravstvenom radniku
@@ -93,7 +93,7 @@ export const practitionerClinicWorkingHoursSchema = z.object({
 /**
  * Schema matching ProcedureSummaryInfo interface
  */
-export const procedureSummaryInfoSchema = z.object({
+/* export const procedureSummaryInfoSchema = z.object({
   id: z.string().min(1),
   name: z.string().min(1),
   description: z.string().optional(),
@@ -110,7 +110,7 @@ export const procedureSummaryInfoSchema = z.object({
   clinicName: z.string().min(1),
   practitionerId: z.string().min(1),
   practitionerName: z.string().min(1),
-});
+}); */
 
 /**
  * Šema za validaciju kompletnog profila zdravstvenog radnika

package/src/validations/procedure.schema.ts

@@ -4,7 +4,7 @@ import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
-import { clinicInfoSchema, doctorInfoSchema } from "./clinic.schema";
+import { clinicInfoSchema, doctorInfoSchema } from "./shared.schema";
 import { procedureReviewInfoSchema } from "./reviews.schema";
 
 /**

package/src/validations/shared.schema.ts

@@ -0,0 +1,78 @@
+import { z } from "zod";
+import { Timestamp } from "firebase/firestore";
+import { ProcedureFamily } from "../backoffice/types/static/procedure-family.types";
+import {
+  Currency,
+  PricingMeasure,
+} from "../backoffice/types/static/pricing.types";
+// Remove import from clinic schema to avoid circular dependency
+// import { clinicLocationSchema, clinicContactInfoSchema } from "./clinic.schema";
+
+/**
+ * Validation schema for clinic contact information
+ */
+export const sharedClinicContactInfoSchema = z.object({
+  email: z.string().email(),
+  phoneNumber: z.string(),
+  alternativePhoneNumber: z.string().nullable().optional(),
+  website: z.string().nullable().optional(),
+});
+
+/**
+ * Validation schema for clinic location
+ */
+export const sharedClinicLocationSchema = z.object({
+  address: z.string(),
+  city: z.string(),
+  country: z.string(),
+  postalCode: z.string(),
+  latitude: z.number().min(-90).max(90),
+  longitude: z.number().min(-180).max(180),
+  geohash: z.string().nullable().optional(),
+});
+
+/**
+ * Schema for procedure summary info - shared between practitioner and clinic schemas
+ */
+export const procedureSummaryInfoSchema = z.object({
+  id: z.string().min(1),
+  name: z.string().min(1),
+  description: z.string().optional(),
+  photo: z.string().optional(),
+  family: z.nativeEnum(ProcedureFamily),
+  categoryName: z.string(),
+  subcategoryName: z.string(),
+  technologyName: z.string(),
+  price: z.number().nonnegative(),
+  pricingMeasure: z.nativeEnum(PricingMeasure),
+  currency: z.nativeEnum(Currency),
+  duration: z.number().int().positive(),
+  clinicId: z.string().min(1),
+  clinicName: z.string().min(1),
+  practitionerId: z.string().min(1),
+  practitionerName: z.string().min(1),
+});
+
+/**
+ * Schema for clinic info - shared between practitioner and clinic schemas
+ */
+export const clinicInfoSchema = z.object({
+  id: z.string(),
+  featuredPhoto: z.string(),
+  name: z.string(),
+  description: z.string().nullable().optional(),
+  location: sharedClinicLocationSchema,
+  contactInfo: sharedClinicContactInfoSchema,
+});
+
+/**
+ * Schema for doctor info - shared between procedure and clinic schemas
+ */
+export const doctorInfoSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  description: z.string().nullable().optional(),
+  photo: z.string(),
+  rating: z.number().min(0).max(5),
+  services: z.array(z.string()), // List of procedure IDs practitioner offers
+});