@blackcode_sa/metaestetics-api 1.5.28 → 1.5.29

package/src/types/clinic/index.ts

@@ -6,6 +6,8 @@ import type {
   PricingMeasure,
 } from "../../backoffice/types/static/pricing.types";
 import type { ClinicInfo } from "../profile";
+import { ClinicReviewInfo } from "../reviews";
+import { ProcedureSummaryInfo } from "../procedure";
 
 export const CLINIC_GROUPS_COLLECTION = "clinic_groups";
 export const CLINIC_ADMINS_COLLECTION = "clinic_admins";
@@ -254,37 +256,23 @@ export interface DoctorInfo {
 /**
  * Interface for service information
  */
-export interface ServiceInfo {
-  id: string;
-  name: string;
-  description?: string;
-  photo: string;
-  procedureFamily: ProcedureFamily;
-  category: string;
-  subCategory: string;
-  technology: string;
-  rating: number;
-  doctors: string[]; // Used for search and filtering
-  price: number;
-  pricingMeasure: PricingMeasure;
-  currency: Currency;
-  duration: number; // Duration in minutes
-  treatmentBenefits: TreatmentBenefit[];
-}
-
-/**
- * Interface for review information
- */
-export interface ReviewInfo {
-  id: string;
-  rating: number;
-  text: string;
-  patientId: string;
-  patientName: string;
-  patientPhoto: string;
-  createdAt: Timestamp;
-  updatedAt: Timestamp;
-}
+// export interface ServiceInfo {  // <-- Comment out or remove old ServiceInfo
+//   id: string;
+//   name: string;
+//   description?: string;
+//   photo: string;
+//   procedureFamily: ProcedureFamily;
+//   category: string;
+//   subCategory: string;
+//   technology: string;
+//   rating: number;
+//   doctors: string[]; // Used for search and filtering
+//   price: number;
+//   pricingMeasure: PricingMeasure;
+//   currency: Currency;
+//   duration: number; // Duration in minutes
+//   treatmentBenefits: TreatmentBenefit[];
+// }
 
 /**
  * Interface for clinic
@@ -303,14 +291,9 @@ export interface Clinic {
   photosWithTags?: { url: string; tag: string }[];
   doctors: string[];
   doctorsInfo: DoctorInfo[];
-  services: string[];
-  servicesInfo: ServiceInfo[];
-  reviews: string[];
-  reviewsInfo: ReviewInfo[];
-  rating: {
-    average: number;
-    count: number;
-  } | null;
+  procedures: string[];
+  proceduresInfo: ProcedureSummaryInfo[]; // <-- Use the new type instead of servicesInfo
+  reviewInfo: ClinicReviewInfo; // Aggregated review information
   admins: string[];
   createdAt: Timestamp;
   updatedAt: Timestamp;
@@ -333,7 +316,8 @@ export interface CreateClinicData {
   coverPhoto: string | null;
   photosWithTags?: { url: string; tag: string }[];
   doctors: string[];
-  services: string[];
+  procedures: string[];
+  proceduresInfo?: ProcedureSummaryInfo[]; // <-- Add this
   admins: string[];
   isActive: boolean;
   isVerified: boolean;
@@ -420,19 +404,3 @@ export interface ClinicBranchSetupData {
 export interface ClinicTags {
   tags: ClinicTag[];
 }
-
-/**
- * Interface for clinic review
- */
-
-// TODO: Add more fields and information about the review (when you start working with review system)
-export interface ClinicReview {
-  id: string;
-  clinicId: string;
-  patientId: string;
-  rating: number; // 1-5
-  comment: string;
-  createdAt: Timestamp;
-  updatedAt: Timestamp;
-  isVerified: boolean;
-}

package/src/types/practitioner/index.ts

@@ -1,11 +1,19 @@
-import { Timestamp, FieldValue } from 'firebase/firestore';
+import { Timestamp, FieldValue } from "firebase/firestore";
 import {
   CertificationLevel,
   CertificationSpecialty,
-} from '../../backoffice/types/static/certification.types';
+} from "../../backoffice/types/static/certification.types";
+import { PractitionerReviewInfo } from "../reviews";
+import { ClinicInfo } from "../profile";
+import { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
+import {
+  Currency,
+  PricingMeasure,
+} from "../../backoffice/types/static/pricing.types";
+import { ProcedureSummaryInfo } from "../procedure";
 
-export const PRACTITIONERS_COLLECTION = 'practitioners';
-export const REGISTER_TOKENS_COLLECTION = 'register_tokens';
+export const PRACTITIONERS_COLLECTION = "practitioners";
+export const REGISTER_TOKENS_COLLECTION = "register_tokens";
 
 /**
  * Osnovne informacije o zdravstvenom radniku
@@ -16,8 +24,8 @@ export interface PractitionerBasicInfo {
   title: string;
   email: string;
   phoneNumber: string;
-  dateOfBirth: Timestamp;
-  gender: 'male' | 'female' | 'other';
+  dateOfBirth: Timestamp | Date;
+  gender: "male" | "female" | "other";
   profileImageUrl?: string;
   bio?: string;
   languages: string[];
@@ -31,9 +39,9 @@ export interface PractitionerCertification {
   specialties: CertificationSpecialty[];
   licenseNumber: string;
   issuingAuthority: string;
-  issueDate: Timestamp;
-  expiryDate?: Timestamp;
-  verificationStatus: 'pending' | 'verified' | 'rejected';
+  issueDate: Timestamp | Date;
+  expiryDate?: Timestamp | Date;
+  verificationStatus: "pending" | "verified" | "rejected";
 }
 
 /**
@@ -51,26 +59,26 @@ export interface PractitionerClinicWorkingHours {
     sunday: { start: string; end: string } | null;
   };
   isActive: boolean;
-  createdAt: Timestamp;
-  updatedAt: Timestamp;
+  createdAt: Timestamp | Date;
+  updatedAt: Timestamp | Date;
 }
 
 /**
  * Status of practitioner profile
  */
 export enum PractitionerStatus {
-  DRAFT = 'draft',
-  ACTIVE = 'active',
+  DRAFT = "draft",
+  ACTIVE = "active",
 }
 
 /**
  * Token status for practitioner invitations
  */
 export enum PractitionerTokenStatus {
-  ACTIVE = 'active',
-  USED = 'used',
-  EXPIRED = 'expired',
-  REVOKED = 'revoked',
+  ACTIVE = "active",
+  USED = "used",
+  EXPIRED = "expired",
+  REVOKED = "revoked",
 }
 
 /**
@@ -83,6 +91,10 @@ export interface Practitioner {
   certification: PractitionerCertification;
   clinics: string[]; // Reference na klinike gde radi
   clinicWorkingHours: PractitionerClinicWorkingHours[]; // Radno vreme za svaku kliniku
+  clinicsInfo: ClinicInfo[]; // Aggregated clinic information
+  procedures: string[]; // Reference na procedure koje izvodi
+  proceduresInfo: ProcedureSummaryInfo[]; // Aggregated procedure information
+  reviewInfo: PractitionerReviewInfo; // Aggregated review information
   isActive: boolean;
   isVerified: boolean;
   status: PractitionerStatus;
@@ -99,6 +111,7 @@ export interface CreatePractitionerData {
   certification: PractitionerCertification;
   clinics?: string[];
   clinicWorkingHours?: PractitionerClinicWorkingHours[];
+  clinicsInfo?: ClinicInfo[];
   isActive: boolean;
   isVerified: boolean;
   status?: PractitionerStatus;
@@ -112,6 +125,7 @@ export interface CreateDraftPractitionerData {
   certification: PractitionerCertification;
   clinics?: string[];
   clinicWorkingHours?: PractitionerClinicWorkingHours[];
+  clinicsInfo?: ClinicInfo[];
   isActive?: boolean;
   isVerified?: boolean;
 }
@@ -119,8 +133,10 @@ export interface CreateDraftPractitionerData {
 /**
  * Tip za ažuriranje zdravstvenog radnika
  */
-export interface UpdatePractitionerData extends Partial<CreatePractitionerData> {
+export interface UpdatePractitionerData
+  extends Partial<CreatePractitionerData> {
   updatedAt?: FieldValue;
+  proceduresInfo?: ProcedureSummaryInfo[];
 }
 
 /**
@@ -135,21 +151,6 @@ export interface PractitionerClinicProcedures {
   updatedAt: Timestamp;
 }
 
-/**
- * Interfejs za recenziju zdravstvenog radnika
- */
-export interface PractitionerReview {
-  id: string;
-  practitionerId: string;
-  patientId: string;
-  clinicId: string;
-  rating: number; // 1-5
-  comment: string;
-  createdAt: Timestamp;
-  updatedAt: Timestamp;
-  isVerified: boolean;
-}
-
 /**
  * Interfejs za radno vreme zdravstvenog radnika u klinici
  */

package/src/types/procedure/index.ts

@@ -15,6 +15,7 @@ import { DocumentTemplate } from "../documentation-templates";
 import { ClinicInfo } from "../profile";
 import { DoctorInfo } from "../clinic";
 import { PRACTITIONERS_COLLECTION } from "../practitioner";
+import { ProcedureReviewInfo } from "../reviews";
 
 /**
  * Procedure represents a specific medical procedure that can be performed by a practitioner in a clinic
@@ -65,6 +66,8 @@ export interface Procedure {
   clinicInfo: ClinicInfo;
   /** Aggregated doctor information */
   doctorInfo: DoctorInfo;
+  /** Aggregated review information for this procedure */
+  reviewInfo: ProcedureReviewInfo;
   /** Whether this procedure is active */
   isActive: boolean;
   /** When this procedure was created */
@@ -103,9 +106,38 @@ export interface UpdateProcedureData {
   pricingMeasure?: PricingMeasure;
   duration?: number;
   isActive?: boolean;
+  practitionerId?: string;
+  categoryId?: string;
+  subcategoryId?: string;
+  technologyId?: string;
+  productId?: string;
+  clinicBranchId?: string;
 }
 
 /**
  * Collection name for procedures in Firestore
  */
 export const PROCEDURES_COLLECTION = "procedures";
+
+/**
+ * Aggregated summary information for a procedure.
+ * Used in arrays within Clinic and Practitioner documents for quick display.
+ */
+export interface ProcedureSummaryInfo {
+  id: string;
+  name: string;
+  description?: string;
+  photo?: string; // Still using empty string if no source found
+  family: ProcedureFamily;
+  categoryName: string; // Use names for aggregation
+  subcategoryName: string; // Use names for aggregation
+  technologyName: string; // Use names for aggregation
+  price: number;
+  pricingMeasure: PricingMeasure;
+  currency: Currency;
+  duration: number;
+  clinicId: string;
+  clinicName: string;
+  practitionerId: string;
+  practitionerName: string;
+}

package/src/types/profile/index.ts

@@ -9,7 +9,7 @@ export interface ClinicInfo {
   id: string;
   featuredPhoto: string;
   name: string;
-  description: string;
+  description?: string | null;
   location: ClinicLocation;
   contactInfo: ClinicContactInfo;
 }

package/src/types/reviews/index.ts

@@ -0,0 +1,126 @@
+/**
+ * Review system type definitions
+ */
+
+/**
+ * Base review interface with common properties
+ */
+interface BaseReview {
+  id: string;
+  fullReviewId: string;
+  patientId: string;
+  createdAt: Date;
+  updatedAt: Date;
+  comment: string;
+  isVerified: boolean;
+  isPublished: boolean;
+}
+
+/**
+ * Clinic review interface
+ * @description Full review for a clinic
+ */
+export interface ClinicReview extends BaseReview {
+  clinicId: string;
+  cleanliness: number; // 1-5 stars
+  facilities: number; // 1-5 stars
+  staffFriendliness: number; // 1-5 stars
+  waitingTime: number; // 1-5 stars
+  accessibility: number; // 1-5 stars
+  overallRating: number; // Average of all ratings
+  wouldRecommend: boolean;
+}
+
+/**
+ * Practitioner review interface
+ * @description Full review for a healthcare practitioner
+ */
+export interface PractitionerReview extends BaseReview {
+  practitionerId: string;
+  knowledgeAndExpertise: number; // 1-5 stars
+  communicationSkills: number; // 1-5 stars
+  bedSideManner: number; // 1-5 stars
+  thoroughness: number; // 1-5 stars
+  trustworthiness: number; // 1-5 stars
+  overallRating: number; // Average of all ratings
+  wouldRecommend: boolean;
+}
+
+/**
+ * Procedure review interface
+ * @description Full review for a medical procedure
+ */
+export interface ProcedureReview extends BaseReview {
+  procedureId: string;
+  effectivenessOfTreatment: number; // 1-5 stars
+  outcomeExplanation: number; // 1-5 stars
+  painManagement: number; // 1-5 stars
+  followUpCare: number; // 1-5 stars
+  valueForMoney: number; // 1-5 stars
+  overallRating: number; // Average of all ratings
+  wouldRecommend: boolean;
+}
+
+/**
+ * Condensed clinic review information
+ * @description Used for aggregated data attached to clinic documents
+ */
+export interface ClinicReviewInfo {
+  totalReviews: number;
+  averageRating: number;
+  cleanliness: number;
+  facilities: number;
+  staffFriendliness: number;
+  waitingTime: number;
+  accessibility: number;
+  recommendationPercentage: number;
+}
+
+/**
+ * Condensed practitioner review information
+ * @description Used for aggregated data attached to practitioner documents
+ */
+export interface PractitionerReviewInfo {
+  totalReviews: number;
+  averageRating: number;
+  knowledgeAndExpertise: number;
+  communicationSkills: number;
+  bedSideManner: number;
+  thoroughness: number;
+  trustworthiness: number;
+  recommendationPercentage: number;
+}
+
+/**
+ * Condensed procedure review information
+ * @description Used for aggregated data attached to procedure documents
+ */
+export interface ProcedureReviewInfo {
+  totalReviews: number;
+  averageRating: number;
+  effectivenessOfTreatment: number;
+  outcomeExplanation: number;
+  painManagement: number;
+  followUpCare: number;
+  valueForMoney: number;
+  recommendationPercentage: number;
+}
+
+/**
+ * Crown review object
+ * @description Combined review data for clinic, practitioner, and procedure
+ */
+export interface Review {
+  id: string;
+  appointmentId: string;
+  patientId: string;
+  createdAt: Date;
+  updatedAt: Date;
+  clinicReview?: ClinicReview;
+  practitionerReview?: PractitionerReview;
+  procedureReview?: ProcedureReview;
+  overallComment: string;
+  overallRating: number; // Average of all available ratings
+}
+
+export const REVIEWS_COLLECTION = "reviews";

package/src/validations/clinic.schema.ts

@@ -13,6 +13,8 @@ import {
   Currency,
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
+import { procedureSummaryInfoSchema } from "./practitioner.schema";
+import { clinicReviewInfoSchema } from "./reviews.schema";
 
 /**
  * Validaciona šema za kontakt informacije
@@ -91,7 +93,7 @@ export const adminInfoSchema = z.object({
 });
 
 /**
- * Validaciona šema za osnovne informacije o klinici
+ * Validaciona šema za osnovne informacije o klinici (for aggregation)
  */
 export const clinicInfoSchema = z.object({
   id: z.string(),
@@ -103,7 +105,7 @@ export const clinicInfoSchema = z.object({
 });
 
 /**
- * Validaciona šema za informacije o doktoru
+ * Validaciona šema za informacije o doktoru (for aggregation in Clinic)
  */
 export const doctorInfoSchema = z.object({
   id: z.string(),
@@ -111,43 +113,30 @@ export const doctorInfoSchema = z.object({
   description: z.string().nullable().optional(),
   photo: z.string(),
   rating: z.number().min(0).max(5),
-  services: z.array(z.string()),
+  services: z.array(z.string()), // List of procedure IDs practitioner offers
 });
 
 /**
- * Validaciona šema za informacije o usluzi
+ * @deprecated Replaced by procedureSummaryInfoSchema.
+ * Validaciona šema za informacije o usluzi (Old aggregation schema)
  */
-export const serviceInfoSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  description: z.string().nullable().optional(),
-  photo: z.string(),
-  procedureFamily: z.nativeEnum(ProcedureFamily),
-  category: z.string(),
-  subCategory: z.string(),
-  technology: z.string(),
-  rating: z.number().min(0).max(5),
-  doctors: z.array(z.string()),
-  price: z.number().min(0),
-  pricingMeasure: z.nativeEnum(PricingMeasure),
-  currency: z.nativeEnum(Currency),
-  duration: z.number().min(0),
-  treatmentBenefits: z.array(z.nativeEnum(TreatmentBenefit)),
-});
-
-/**
- * Validaciona šema za informacije o recenziji
- */
-export const reviewInfoSchema = z.object({
-  id: z.string(),
-  rating: z.number().min(1).max(5),
-  text: z.string(),
-  patientId: z.string(),
-  patientName: z.string(),
-  patientPhoto: z.string(),
-  createdAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
-  updatedAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
-});
+// export const serviceInfoSchema = z.object({
+//   id: z.string(),
+//   name: z.string(),
+//   description: z.string().nullable().optional(),
+//   photo: z.string(),
+//   procedureFamily: z.nativeEnum(ProcedureFamily),
+//   category: z.string(),
+//   subCategory: z.string(),
+//   technology: z.string(),
+//   rating: z.number().min(0).max(5),
+//   doctors: z.array(z.string()),
+//   price: z.number().min(0),
+//   pricingMeasure: z.nativeEnum(PricingMeasure),
+//   currency: z.nativeEnum(Currency),
+//   duration: z.number().min(0),
+//   treatmentBenefits: z.array(z.nativeEnum(TreatmentBenefit)),
+// });
 
 /**
  * Validaciona šema za administratora klinike
@@ -215,20 +204,6 @@ export const clinicGroupSchema = z.object({
   businessIdentificationNumber: z.string().optional().nullable(),
 });
 
-/**
- * Validaciona šema za recenziju klinike
- */
-export const clinicReviewSchema = z.object({
-  id: z.string(),
-  clinicId: z.string(),
-  patientId: z.string(),
-  rating: z.number().min(1).max(5),
-  comment: z.string(),
-  createdAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
-  updatedAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
-  isVerified: z.boolean(),
-});
-
 /**
  * Validaciona šema za kliniku
  */
@@ -251,18 +226,13 @@ export const clinicSchema = z.object({
       })
     )
     .optional(),
-  doctors: z.array(z.string()),
-  doctorsInfo: z.array(doctorInfoSchema),
-  services: z.array(z.string()),
-  servicesInfo: z.array(serviceInfoSchema),
-  reviews: z.array(z.string()),
-  reviewsInfo: z.array(reviewInfoSchema),
-  rating: z
-    .object({
-      average: z.number().min(0).max(5),
-      count: z.number().min(0),
-    })
-    .nullable(),
+  doctors: z.array(z.string()), // List of practitioner IDs
+  doctorsInfo: z.array(doctorInfoSchema), // Aggregated doctor info
+  procedures: z.array(z.string()), // List of procedure IDs offered by clinic
+  proceduresInfo: z.array(procedureSummaryInfoSchema), // Use the correct schema for aggregated procedure info
+  // services: z.array(z.string()), // Likely deprecated, procedures covers this
+  // servicesInfo: z.array(serviceInfoSchema), // Deprecated, use proceduresInfo
+  reviewInfo: clinicReviewInfoSchema,
   admins: z.array(z.string()),
   createdAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
   updatedAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
@@ -282,6 +252,7 @@ export const createClinicAdminSchema = z.object({
   contactInfo: contactPersonSchema,
   roleTitle: z.string(),
   isActive: z.boolean(),
+  // clinicsManagedInfo is aggregated, not provided on creation
 });
 
 /**
@@ -305,6 +276,7 @@ export const createClinicGroupSchema = z.object({
   calendarSyncEnabled: z.boolean().optional(),
   autoConfirmAppointments: z.boolean().optional(),
   businessIdentificationNumber: z.string().optional().nullable(),
+  // clinics, clinicsInfo, admins, adminsInfo, adminTokens are managed internally
 });
 
 /**
@@ -327,9 +299,10 @@ export const createClinicSchema = z.object({
       })
     )
     .optional(),
-  doctors: z.array(z.string()),
-  services: z.array(z.string()),
-  admins: z.array(z.string()),
+  // doctors, doctorsInfo, procedures, proceduresInfo are managed internally/aggregated
+  // doctors: z.array(z.string()),
+  // services: z.array(z.string()), // Deprecated
+  admins: z.array(z.string()), // Should likely just be creator ID initially
   isActive: z.boolean(),
   isVerified: z.boolean(),
   logo: z.string().optional(),