docta-package 1.2.131 → 1.2.134

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

@@ -8,7 +8,7 @@ import { LanguageOutputDto } from "./language";
 import { FaqOutputDto } from "./faq";
 import { LocationOutputDto } from "./location";
 export declare class DoctorPublicOutputDto {
-    id: string;
+    id: string | null;
     specialty: SpecialtyOutputDto;
     title: string;
     professionalEmail: string;

package/build/dto/output/doctor.js

@@ -9,10 +9,11 @@ const position_1 = require("./position");
 const language_1 = require("./language");
 const faq_1 = require("./faq");
 const location_1 = require("./location");
+const normalize_id_1 = require("../../utils/normalize.id");
 class DoctorPublicOutputDto {
     constructor(doctor) {
-        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();
+        var _a;
+        this.id = (0, normalize_id_1.normalizeId)(doctor);
         this.title = doctor.title;
         this.professionalEmail = doctor.professionalEmail;
         this.dontBookMeBeforeInMins = doctor.dontBookMeBeforeInMins;
@@ -20,7 +21,7 @@ class DoctorPublicOutputDto {
         this.slug = doctor.slug;
         this.biography = doctor.biography || null;
         this.isActive = doctor.isActive;
-        this.consultationFeePerHour = (_c = doctor.consultationFeePerHour) !== null && _c !== void 0 ? _c : null;
+        this.consultationFeePerHour = (_a = doctor.consultationFeePerHour) !== null && _a !== void 0 ? _a : null;
         this.isVerified = doctor.isVerified;
         this.isVisible = doctor.isVisible;
         this.photo = doctor.photo || null;

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

@@ -1,7 +1,7 @@
 import { IExpertiseDocument } from "../../models";
 import { UserOutputDto } from "./user";
 export declare class ExpertiseOutputDto {
-    id: string;
+    id: string | null;
     en: {
         name: string;
         description: string | null;

package/build/dto/output/expertise.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpertiseAdminOutputDto = exports.ExpertiseOutputDto = void 0;
 const user_1 = require("./user");
+const normalize_id_1 = require("../../utils/normalize.id");
 // Base DTO for everyone
 class ExpertiseOutputDto {
     constructor(expertise) {
-        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.id = (0, normalize_id_1.normalizeId)(expertise);
         this.en = {
             name: expertise.en.name,
             description: expertise.en.description || null,

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

@@ -2,7 +2,7 @@ import { Gender } from "../../enums";
 import { IPatientDocument } from "../../models";
 import { UserOutputDto, UserPublicOutputDto } from "./user";
 declare class OutputDto {
-    id: string;
+    id: string | null;
     dob: number | null;
     phoneNumber: string | null;
     gender: Gender | null;

package/build/dto/output/patient.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PatientAdminOutputDto = exports.PatientOutputDto = exports.PatientPublicOutputDto = void 0;
 const user_1 = require("./user");
+const normalize_id_1 = require("../../utils/normalize.id");
 class OutputDto {
     constructor(patient) {
-        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.id = (0, normalize_id_1.normalizeId)(patient);
         this.dob = patient.dob || null;
         this.phoneNumber = patient.phoneNumber || null;
         this.gender = patient.gender || null;

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

@@ -2,7 +2,7 @@ import { IPeriodDocument } from "../../models";
 import { UserOutputDto } from "./user";
 import { PeriodStatus } from "../../enums/period.status";
 export declare class PeriodOutputDto {
-    id: string;
+    id: string | null;
     doctorId: string;
     startTime: number;
     endTime: number;

package/build/dto/output/period.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PeriodAdminOutputDto = exports.PeriodDoctorOutputDto = exports.PeriodOutputDto = void 0;
 const user_1 = require("./user");
+const normalize_id_1 = require("../../utils/normalize.id");
 // Base DTO for everyone
 class PeriodOutputDto {
     constructor(period) {
-        var _a, _b;
-        this.id = (_b = ((_a = period.id) !== null && _a !== void 0 ? _a : period._id)) === null || _b === void 0 ? void 0 : _b.toString();
+        this.id = (0, normalize_id_1.normalizeId)(period);
         this.doctorId = String(period.doctor._id);
         this.startTime = period.startTime;
         this.endTime = period.endTime;

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

@@ -8,7 +8,7 @@ interface ISessionConfigOutput {
     disbursementPercentage: number;
 }
 export declare class SessionOutputDto {
-    id: string;
+    id: string | null;
     period: PeriodOutputDto;
     status: string;
     doctorId: string | null;

package/build/dto/output/session.js

@@ -7,8 +7,8 @@ const user_1 = require("./user");
 // Base DTO for everyone
 class SessionOutputDto {
     constructor(session) {
-        var _a, _b;
-        this.id = (_b = ((_a = session.id) !== null && _a !== void 0 ? _a : session._id)) === null || _b === void 0 ? void 0 : _b.toString();
+        this.id = (0, normalize_id_1.normalizeId)(session);
+        // (session.id ?? session._id)?.toString();
         this.period = new period_1.PeriodOutputDto(session.period);
         this.status = session.status;
         this.doctorId =

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

@@ -1,7 +1,7 @@
 import { ISpecialtyDocument } from "../../models";
 import { UserOutputDto } from "./user";
 export declare class SpecialtyOutputDto {
-    id: string;
+    id: string | null;
     en: {
         name: string;
         description: string | null;

package/build/dto/output/specialty.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecialtyAdminOutputDto = exports.SpecialtyOutputDto = void 0;
 const user_1 = require("./user");
+const normalize_id_1 = require("../../utils/normalize.id");
 // Base DTO for everyone
 class SpecialtyOutputDto {
     constructor(specialty) {
-        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.id = (0, normalize_id_1.normalizeId)(specialty);
         this.en = {
             name: specialty.en.name,
             description: specialty.en.description || null,

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

@@ -1,6 +1,6 @@
 import { IUserDocument } from "../../models";
 export declare class UserPublicOutputDto {
-    id: string;
+    id: string | null;
     name: string;
     email: string;
     role: string;

package/build/dto/output/user.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggedInUserOutputDto = exports.UserAdminOutputDto = exports.UserOutputDto = exports.UserPublicOutputDto = void 0;
+const normalize_id_1 = require("../../utils/normalize.id");
 class UserPublicOutputDto {
     constructor(user) {
-        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.id = (0, normalize_id_1.normalizeId)(user);
         this.name = user.name;
         this.email = user.email;
         this.role = user.role;

package/build/utils/normalize.id.js

@@ -8,17 +8,17 @@ const mongoose_1 = __importDefault(require("mongoose"));
 function normalizeId(value) {
     if (!value)
         return null;
-    // populated doc → {_id: ObjectId}
-    if (typeof value === "object" && value._id) {
-        return normalizeId(value._id);
-    }
-    // ObjectId
+    // 1️⃣ Raw ObjectId (aggregation, normal query)
     if (value instanceof mongoose_1.default.Types.ObjectId) {
         return value.toString();
     }
-    // already a string
+    // 2️⃣ Already a string
     if (typeof value === "string") {
         return value;
     }
+    // 3️⃣ Populated document or plain object with _id
+    if (typeof value === "object" && value._id) {
+        return normalizeId(value._id);
+    }
     return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docta-package",
-  "version": "1.2.131",
+  "version": "1.2.134",
   "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",