docta-package 1.2.58 → 1.2.60

package/build/dto/output/doctor.js

@@ -12,15 +12,15 @@ const location_1 = require("./location");
 // Base DTO for everyone
 class DoctorOutputDto {
     constructor(doctor) {
-        var _a;
-        this.id = doctor.id.toString();
+        var _a, _b, _c;
+        this.id = (_b = ((_a = doctor.id) !== null && _a !== void 0 ? _a : doctor._id)) === null || _b === void 0 ? void 0 : _b.toString();
         this.user = new user_1.UserOutputDto(doctor.user);
         this.name = doctor.name;
         this.specialty = new specialty_1.SpecialtyOutputDto(doctor.specialty);
         this.slug = doctor.slug;
         this.biography = doctor.biography || null;
         this.isActive = doctor.isActive;
-        this.consultationFeePerHour = (_a = doctor.consultationFeePerHour) !== null && _a !== void 0 ? _a : null;
+        this.consultationFeePerHour = (_c = doctor.consultationFeePerHour) !== null && _c !== void 0 ? _c : null;
         this.isVerified = doctor.isVerified;
         this.isVisible = doctor.isVisible;
         this.photo = doctor.photo || null;

package/build/dto/output/expertise.js

@@ -5,7 +5,8 @@ const user_1 = require("./user");
 // Base DTO for everyone
 class ExpertiseOutputDto {
     constructor(expertise) {
-        this.id = expertise.id.toString();
+        var _a, _b;
+        this.id = (_b = ((_a = expertise.id) !== null && _a !== void 0 ? _a : expertise._id)) === null || _b === void 0 ? void 0 : _b.toString();
         this.en = {
             name: expertise.en.name,
             description: expertise.en.description || null,

package/build/dto/output/patient.js

@@ -5,7 +5,8 @@ const user_1 = require("./user");
 // Base DTO for everyone
 class PatientOutputDto {
     constructor(patient) {
-        this.id = patient.id.toString();
+        var _a, _b;
+        this.id = (_b = ((_a = patient.id) !== null && _a !== void 0 ? _a : patient._id)) === null || _b === void 0 ? void 0 : _b.toString();
         this.user = new user_1.UserOutputDto(patient.user);
         this.dob = patient.dob || null;
         this.phoneNumber = patient.phoneNumber || null;

package/build/dto/output/session.d.ts

@@ -2,6 +2,7 @@ import { ISessionDocument } from "../../models";
 import { PeriodOutputDto } from "./period";
 import { PatientOutputDto } from "./patient";
 import { UserOutputDto } from "./user";
+import { DoctorOutputDto } from "./doctor";
 interface ISessionConfigOutput {
     originalDoctorConsultationFeePerHour: number;
     platformPercentage: number;
@@ -18,6 +19,7 @@ export declare class SessionOutputDto {
     constructor(session: ISessionDocument);
 }
 export declare class SessionPatientOutputDto extends SessionOutputDto {
+    doctor: DoctorOutputDto;
     pricing: {
         totalPrice: number;
         paymentApiPrice: number;
@@ -25,8 +27,8 @@ export declare class SessionPatientOutputDto extends SessionOutputDto {
     constructor(session: ISessionDocument);
 }
 export declare class SessionDoctorOutputDto extends SessionOutputDto {
-    price: number;
     patient: PatientOutputDto;
+    price: number;
     constructor(session: ISessionDocument);
 }
 export declare class SessionAdminOutputDto extends SessionOutputDto {

package/build/dto/output/session.js

@@ -4,6 +4,7 @@ exports.SessionAdminOutputDto = exports.SessionDoctorOutputDto = exports.Session
 const period_1 = require("./period");
 const patient_1 = require("./patient");
 const user_1 = require("./user");
+const doctor_1 = require("./doctor");
 // Base DTO for everyone
 class SessionOutputDto {
     constructor(session) {
@@ -21,6 +22,7 @@ exports.SessionOutputDto = SessionOutputDto;
 class SessionPatientOutputDto extends SessionOutputDto {
     constructor(session) {
         super(session); // call base constructor
+        this.doctor = new doctor_1.DoctorOutputDto(session.doctor);
         this.pricing = {
             totalPrice: session.pricing.totalPrice,
             paymentApiPrice: session.pricing.paymentApiPrice,

package/build/dto/output/specialty.js

@@ -5,7 +5,8 @@ const user_1 = require("./user");
 // Base DTO for everyone
 class SpecialtyOutputDto {
     constructor(specialty) {
-        this.id = specialty.id.toString();
+        var _a, _b;
+        this.id = (_b = ((_a = specialty.id) !== null && _a !== void 0 ? _a : specialty._id)) === null || _b === void 0 ? void 0 : _b.toString();
         this.en = {
             name: specialty.en.name,
             description: specialty.en.description || null,

package/build/dto/output/user.js

@@ -4,7 +4,8 @@ exports.LoggedInUserOutputDto = exports.UserAdminOutputDto = exports.UserOutputD
 // Base DTO for everyone
 class UserOutputDto {
     constructor(user) {
-        this.id = user.id.toString();
+        var _a, _b;
+        this.id = (_b = ((_a = user.id) !== null && _a !== void 0 ? _a : user._id)) === null || _b === void 0 ? void 0 : _b.toString();
         this.name = user.name;
         this.email = user.email;
         this.role = user.role;

package/build/models/period.d.ts

@@ -13,11 +13,3 @@ export interface IPeriodDocument extends IPeriod, Document {
 export interface IPeriodModel extends Model<IPeriodDocument> {
 }
 export declare const PeriodModel: IPeriodModel;
-/**
- * Validates that the difference between startTime and endTime
- * is one of [15, 30, 60, 90, 120] minutes and startTime < endTime.
- */
-/**
- * Checks if a given period overlaps with any existing period for a doctor.
- * Returns true if overlap exists, false otherwise.
- */

package/build/models/period.js

@@ -17,50 +17,3 @@ const PeriodSchema = new mongoose_1.Schema(Object.assign(Object.assign({}, base_
     } }));
 PeriodSchema.plugin(base_1.BaseSchemaPlugin);
 exports.PeriodModel = (0, mongoose_1.model)("Period", PeriodSchema);
-/////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Validates that the difference between startTime and endTime
- * is one of [15, 30, 60, 90, 120] minutes and startTime < endTime.
- */
-// function isValidTimeGap(startTime: number, endTime: number): boolean {
-//     // Ensure startTime < endTime
-//     if (endTime <= startTime) return false;
-//     // Allowed gaps in minutes
-//     const allowedGaps = [15, 30, 60, 90, 120];
-//     // Convert milliseconds to minutes
-//     const diffInMinutes = (endTime - startTime) / (1000 * 60);
-//     // Check if difference matches any allowed gap
-//     return allowedGaps.includes(diffInMinutes);
-//   }
-/////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Checks if a given period overlaps with any existing period for a doctor.
- * Returns true if overlap exists, false otherwise.
- */
-// export async function checkPeriodOverlap(
-//     doctorId: string | Types.ObjectId,
-//     startTime: number,
-//     endTime: number
-//   ): Promise<boolean> {
-//     const overlappingPeriod = await PeriodModel.findOne({
-//       doctor: doctorId,
-//       $or: [
-//         {
-//           // New start is inside an existing period
-//           startTime: { $lte: startTime },
-//           endTime: { $gt: startTime },
-//         },
-//         {
-//           // New end is inside an existing period
-//           startTime: { $lt: endTime },
-//           endTime: { $gte: endTime },
-//         },
-//         {
-//           // New period fully covers an existing one
-//           startTime: { $gte: startTime },
-//           endTime: { $lte: endTime },
-//         },
-//       ],
-//     });
-//     return !!overlappingPeriod;
-//   }

package/build/models/session.d.ts

@@ -3,6 +3,7 @@ import { IBaseModel } from "./base";
 import { IPeriodDocument } from "./period";
 import { IPatientDocument } from "./patient";
 import { SessionStatus } from "../enums/session.status";
+import { IDoctorDocument } from "./doctor";
 /**
  * Interface for session configuration percentages
  */
@@ -18,6 +19,7 @@ export interface ISessionConfig {
 export interface ISession extends IBaseModel {
     period: IPeriodDocument;
     patient: IPatientDocument;
+    doctor: IDoctorDocument;
     status: SessionStatus;
     pricing: {
         totalPrice: number;

package/build/models/session.js

@@ -6,6 +6,7 @@ const base_1 = require("./base");
 const period_1 = require("./period");
 const patient_1 = require("./patient");
 const session_status_1 = require("../enums/session.status");
+const doctor_1 = require("./doctor");
 /**
  * Schema definition
  */
@@ -17,6 +18,10 @@ const SessionSchema = new mongoose_1.Schema(Object.assign(Object.assign({}, base
         type: mongoose_1.Schema.Types.ObjectId,
         ref: patient_1.PatientModel.modelName,
         required: true,
+    }, doctor: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: doctor_1.DoctorModel.modelName,
+        required: true,
     }, status: {
         type: String,
         enum: Object.values(session_status_1.SessionStatus),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docta-package",
-  "version": "1.2.58",
+  "version": "1.2.60",
   "description": "This package will contail all the required files to run the docta micro-service app",
   "main": "build/index.js",
   "types": "build/index.d.ts",