goldstars-services 1.0.59 → 1.0.61

package/dist/controllers/instructorSchedule.controller.js

@@ -0,0 +1,202 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateInstructorSchedule = exports.getInstructorSchedules = exports.getInstructorForSlot = exports.deleteInstructorSchedule = exports.createInstructorSchedule = void 0;
+var _instructorScheduleService = _interopRequireDefault(require("../services/instructorSchedule.service.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; } // MicroService/src/controllers/instructorSchedule.controller.js
+/**
+ * Creates a new weekly instructor schedule
+ */
+var createInstructorSchedule = exports.createInstructorSchedule = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* (req, res) {
+    try {
+      var {
+        instructorId,
+        instructorName,
+        location,
+        dayOfWeek,
+        timeSlot,
+        specialization
+      } = req.body;
+
+      // Validate required fields
+      if (!instructorId || !instructorName || !location || !dayOfWeek || !timeSlot) {
+        return res.status(400).json({
+          status: 400,
+          message: 'Todos los campos requeridos deben ser proporcionados: instructorId, instructorName, location, dayOfWeek, timeSlot'
+        });
+      }
+      var scheduleData = {
+        instructorId,
+        instructorName,
+        location,
+        dayOfWeek: parseInt(dayOfWeek),
+        timeSlot,
+        specialization: specialization || 'Spinning'
+      };
+      var newSchedule = yield _instructorScheduleService.default.createInstructorSchedule(scheduleData);
+      res.status(201).json({
+        status: 201,
+        message: 'Asignación de instructor creada exitosamente',
+        data: newSchedule
+      });
+    } catch (error) {
+      console.error('Error creating instructor schedule:', error);
+      res.status(400).json({
+        status: 400,
+        message: error.message || 'Error al crear la asignación del instructor'
+      });
+    }
+  });
+  return function createInstructorSchedule(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * Gets instructor schedules filtered by location
+ */
+var getInstructorSchedules = exports.getInstructorSchedules = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(function* (req, res) {
+    try {
+      var {
+        location
+      } = req.query;
+      var schedules;
+      if (location) {
+        schedules = yield _instructorScheduleService.default.getInstructorSchedulesByLocation(location);
+      } else {
+        schedules = yield _instructorScheduleService.default.getAllInstructorSchedules();
+      }
+      res.status(200).json({
+        status: 200,
+        message: 'Asignaciones de instructor obtenidas exitosamente',
+        data: schedules
+      });
+    } catch (error) {
+      console.error('Error fetching instructor schedules:', error);
+      res.status(500).json({
+        status: 500,
+        message: error.message || 'Error al obtener las asignaciones de instructor'
+      });
+    }
+  });
+  return function getInstructorSchedules(_x3, _x4) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+/**
+ * Gets instructor for a specific slot
+ */
+var getInstructorForSlot = exports.getInstructorForSlot = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(function* (req, res) {
+    try {
+      var {
+        location,
+        dayOfWeek,
+        timeSlot
+      } = req.query;
+      if (!location || !dayOfWeek || !timeSlot) {
+        return res.status(400).json({
+          status: 400,
+          message: 'location, dayOfWeek y timeSlot son requeridos'
+        });
+      }
+      var instructor = yield _instructorScheduleService.default.getInstructorForSlot(location, parseInt(dayOfWeek), timeSlot);
+      if (!instructor) {
+        return res.status(404).json({
+          status: 404,
+          message: 'No hay instructor asignado para este horario'
+        });
+      }
+      res.status(200).json({
+        status: 200,
+        message: 'Instructor encontrado',
+        data: instructor
+      });
+    } catch (error) {
+      console.error('Error fetching instructor for slot:', error);
+      res.status(500).json({
+        status: 500,
+        message: error.message || 'Error al obtener el instructor para el horario'
+      });
+    }
+  });
+  return function getInstructorForSlot(_x5, _x6) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+/**
+ * Deletes an instructor schedule
+ */
+var deleteInstructorSchedule = exports.deleteInstructorSchedule = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(function* (req, res) {
+    try {
+      var {
+        id
+      } = req.params;
+      if (!id) {
+        return res.status(400).json({
+          status: 400,
+          message: 'ID de la asignación es requerido'
+        });
+      }
+      var result = yield _instructorScheduleService.default.deleteInstructorSchedule(id);
+      res.status(200).json({
+        status: 200,
+        message: result.message,
+        data: result.deletedSchedule
+      });
+    } catch (error) {
+      console.error('Error deleting instructor schedule:', error);
+      res.status(404).json({
+        status: 404,
+        message: error.message || 'Error al eliminar la asignación del instructor'
+      });
+    }
+  });
+  return function deleteInstructorSchedule(_x7, _x8) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+/**
+ * Updates an instructor schedule
+ */
+var updateInstructorSchedule = exports.updateInstructorSchedule = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator(function* (req, res) {
+    try {
+      var {
+        id
+      } = req.params;
+      var updateData = req.body;
+      if (!id) {
+        return res.status(400).json({
+          status: 400,
+          message: 'ID de la asignación es requerido'
+        });
+      }
+      var updatedSchedule = yield _instructorScheduleService.default.updateInstructorSchedule(id, updateData);
+      res.status(200).json({
+        status: 200,
+        message: 'Asignación de instructor actualizada exitosamente',
+        data: updatedSchedule
+      });
+    } catch (error) {
+      console.error('Error updating instructor schedule:', error);
+      res.status(404).json({
+        status: 404,
+        message: error.message || 'Error al actualizar la asignación del instructor'
+      });
+    }
+  });
+  return function updateInstructorSchedule(_x9, _x10) {
+    return _ref5.apply(this, arguments);
+  };
+}();

package/dist/models/instructorSchedule.model.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _mongoose = _interopRequireDefault(require("mongoose"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// MicroService/src/models/instructorSchedule.model.js
+
+var instructorScheduleSchema = new _mongoose.default.Schema({
+  instructorId: {
+    type: _mongoose.default.Schema.Types.ObjectId,
+    ref: 'User',
+    // Assuming instructors are stored in User model
+    required: true
+  },
+  instructorName: {
+    type: String,
+    required: true
+  },
+  location: {
+    type: String,
+    required: true,
+    enum: ['Sambil Paraguaná', 'C.C Las Virtudes']
+  },
+  dayOfWeek: {
+    type: Number,
+    required: true,
+    min: 1,
+    // Monday = 1
+    max: 5 // Friday = 5
+  },
+  timeSlot: {
+    type: String,
+    required: true
+    // Examples: '7am', '8am', '9:15am', '5pm', '7pm'
+  },
+  specialization: {
+    type: String,
+    default: 'Spinning'
+  },
+  isActive: {
+    type: Boolean,
+    default: true
+  },
+  createdAt: {
+    type: Date,
+    default: Date.now
+  },
+  updatedAt: {
+    type: Date,
+    default: Date.now
+  }
+});
+
+// Create a compound index to ensure unique instructor assignments per location/day/time
+instructorScheduleSchema.index({
+  location: 1,
+  dayOfWeek: 1,
+  timeSlot: 1
+}, {
+  unique: true
+});
+
+// Update the updatedAt field before saving
+instructorScheduleSchema.pre('save', function (next) {
+  this.updatedAt = new Date();
+  next();
+});
+var InstructorSchedule = _mongoose.default.model('InstructorSchedule', instructorScheduleSchema);
+var _default = exports.default = InstructorSchedule;

package/dist/services/instructorSchedule.service.js

@@ -0,0 +1,246 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _instructorScheduleModel = _interopRequireDefault(require("../models/instructorSchedule.model.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; } // MicroService/src/services/instructorSchedule.service.js
+/**
+ * Helper function to extract time slot from timestamp
+ * @param {Date} timestamp - The timestamp
+ * @returns {string} - Time slot string (e.g., '7am', '5pm')
+ */
+var extractTimeSlotFromTimestamp = timestamp => {
+  var hour = timestamp.getHours();
+  var minute = timestamp.getMinutes();
+
+  // Convert to 12-hour format with am/pm
+  if (hour === 0) return '12am';
+  if (hour < 12) {
+    if (minute === 0) return "".concat(hour, "am");
+    return "".concat(hour, ":").concat(minute.toString().padStart(2, '0'), "am");
+  }
+  if (hour === 12) {
+    if (minute === 0) return '12pm';
+    return "12:".concat(minute.toString().padStart(2, '0'), "pm");
+  }
+  var hour12 = hour - 12;
+  if (minute === 0) return "".concat(hour12, "pm");
+  return "".concat(hour12, ":").concat(minute.toString().padStart(2, '0'), "pm");
+};
+
+/**
+ * Creates a weekly instructor assignment
+ * @param {object} scheduleData - The schedule data
+ * @param {string} scheduleData.instructorId - Instructor's user ID
+ * @param {string} scheduleData.instructorName - Instructor's name
+ * @param {string} scheduleData.location - Location (Sambil Paraguaná or C.C Las Virtudes)
+ * @param {number} scheduleData.dayOfWeek - Day of week (1=Monday, 5=Friday)
+ * @param {string} scheduleData.timeSlot - Time slot (e.g., '7am', '5pm')
+ * @param {string} [scheduleData.specialization] - Instructor's specialization
+ * @returns {Promise<object>} - The created schedule document
+ */
+var createInstructorSchedule = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* (scheduleData) {
+    var {
+      instructorId,
+      instructorName,
+      location,
+      dayOfWeek,
+      timeSlot,
+      specialization = 'Spinning'
+    } = scheduleData;
+
+    // Validate required fields
+    if (!instructorId || !instructorName || !location || !dayOfWeek || !timeSlot) {
+      throw new Error('Todos los campos requeridos deben ser proporcionados.');
+    }
+
+    // Validate day of week
+    if (dayOfWeek < 1 || dayOfWeek > 5) {
+      throw new Error('El día de la semana debe estar entre 1 (Lunes) y 5 (Viernes).');
+    }
+
+    // Validate location
+    if (!['Sambil Paraguaná', 'C.C Las Virtudes'].includes(location)) {
+      throw new Error('Ubicación no válida.');
+    }
+    try {
+      var newSchedule = new _instructorScheduleModel.default({
+        instructorId,
+        instructorName,
+        location,
+        dayOfWeek,
+        timeSlot,
+        specialization
+      });
+      yield newSchedule.save();
+      return newSchedule;
+    } catch (error) {
+      if (error.code === 11000) {
+        throw new Error('Ya existe un instructor asignado para este horario y ubicación.');
+      }
+      throw error;
+    }
+  });
+  return function createInstructorSchedule(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * Gets instructor assignments for a specific location
+ * @param {string} location - The location to filter by
+ * @returns {Promise<Array<object>>} - Array of instructor schedules
+ */
+var getInstructorSchedulesByLocation = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(function* (location) {
+    if (!location) {
+      throw new Error('La ubicación es requerida.');
+    }
+    var schedules = yield _instructorScheduleModel.default.find({
+      location,
+      isActive: true
+    }).sort({
+      dayOfWeek: 1,
+      timeSlot: 1
+    });
+    return schedules;
+  });
+  return function getInstructorSchedulesByLocation(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+/**
+ * Gets all instructor assignments
+ * @returns {Promise<Array<object>>} - Array of all instructor schedules
+ */
+var getAllInstructorSchedules = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(function* () {
+    var schedules = yield _instructorScheduleModel.default.find({
+      isActive: true
+    }).sort({
+      location: 1,
+      dayOfWeek: 1,
+      timeSlot: 1
+    });
+    return schedules;
+  });
+  return function getAllInstructorSchedules() {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+/**
+ * Gets instructor for a specific location, day and time
+ * @param {string} location - Location
+ * @param {number} dayOfWeek - Day of week (1=Monday, 5=Friday)
+ * @param {string} timeSlot - Time slot
+ * @returns {Promise<object|null>} - Instructor schedule or null if not found
+ */
+var getInstructorForSlot = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(function* (location, dayOfWeek, timeSlot) {
+    var schedule = yield _instructorScheduleModel.default.findOne({
+      location,
+      dayOfWeek,
+      timeSlot,
+      isActive: true
+    });
+    return schedule;
+  });
+  return function getInstructorForSlot(_x3, _x4, _x5) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+/**
+ * Gets instructor for a specific timestamp (automatically calculates day and time)
+ * @param {string} location - Location
+ * @param {Date} timestamp - The timestamp to check
+ * @returns {Promise<object|null>} - Instructor schedule or null if not found
+ */
+var getInstructorForTimestamp = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator(function* (location, timestamp) {
+    var date = new Date(timestamp);
+    var dayOfWeek = date.getDay(); // 0=Sunday, 1=Monday, ..., 6=Saturday
+
+    // Convert Sunday=0 to Monday=1 format and skip weekends
+    if (dayOfWeek === 0 || dayOfWeek === 6) {
+      return null; // No classes on weekends
+    }
+    var normalizedDayOfWeek = dayOfWeek; // Keep as is since 1=Monday, 5=Friday
+    var timeSlot = extractTimeSlotFromTimestamp(date);
+    return yield getInstructorForSlot(location, normalizedDayOfWeek, timeSlot);
+  });
+  return function getInstructorForTimestamp(_x6, _x7) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
+/**
+ * Deletes an instructor schedule
+ * @param {string} scheduleId - ID of the schedule to delete
+ * @returns {Promise<object>} - Result of the deletion
+ */
+var deleteInstructorSchedule = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator(function* (scheduleId) {
+    var schedule = yield _instructorScheduleModel.default.findById(scheduleId);
+    if (!schedule) {
+      throw new Error('Asignación de instructor no encontrada.');
+    }
+    var result = yield _instructorScheduleModel.default.deleteOne({
+      _id: scheduleId
+    });
+    if (result.deletedCount === 0) {
+      throw new Error('No se pudo eliminar la asignación del instructor.');
+    }
+    return {
+      message: 'Asignación de instructor eliminada exitosamente.',
+      deletedSchedule: schedule
+    };
+  });
+  return function deleteInstructorSchedule(_x8) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+
+/**
+ * Updates an instructor schedule
+ * @param {string} scheduleId - ID of the schedule to update
+ * @param {object} updateData - Data to update
+ * @returns {Promise<object>} - Updated schedule
+ */
+var updateInstructorSchedule = /*#__PURE__*/function () {
+  var _ref7 = _asyncToGenerator(function* (scheduleId, updateData) {
+    var schedule = yield _instructorScheduleModel.default.findById(scheduleId);
+    if (!schedule) {
+      throw new Error('Asignación de instructor no encontrada.');
+    }
+
+    // Update fields
+    Object.keys(updateData).forEach(key => {
+      if (updateData[key] !== undefined) {
+        schedule[key] = updateData[key];
+      }
+    });
+    yield schedule.save();
+    return schedule;
+  });
+  return function updateInstructorSchedule(_x9, _x10) {
+    return _ref7.apply(this, arguments);
+  };
+}();
+var _default = exports.default = {
+  createInstructorSchedule,
+  getInstructorSchedulesByLocation,
+  getAllInstructorSchedules,
+  getInstructorForSlot,
+  getInstructorForTimestamp,
+  deleteInstructorSchedule,
+  updateInstructorSchedule,
+  extractTimeSlotFromTimestamp
+};

package/dist/services/report.service.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _report = _interopRequireDefault(require("../models/report.model"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 /**
  * @description Get report by query params
  * @param {Object} queryParams
@@ -47,9 +49,51 @@ var updateReport = (queryParams, paramsToUpdate) => {
 var deleteReport = queryParams => {
   return _report.default.findOneAndDelete(queryParams);
 };
+
+/**
+ * @description Get all reports with pagination and filters
+ * @param {Object} filters - MongoDB query filters
+ * @param {Object} options - Pagination options { page, limit, sort }
+ * @returns Promise<Object> - { data, currentPage, totalPages, total, hasNext, hasPrev }
+ */
+var getAllReports = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* () {
+    var filters = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var {
+      page = 1,
+      limit = 10,
+      sort = {
+        createdAt: -1
+      }
+    } = options;
+    var skip = (page - 1) * limit;
+    try {
+      var [data, total] = yield Promise.all([_report.default.find(filters).sort(sort).skip(skip).limit(limit).lean(), _report.default.countDocuments(filters)]);
+      var totalPages = Math.ceil(total / limit);
+      var currentPage = page;
+      var hasNext = page < totalPages;
+      var hasPrev = page > 1;
+      return {
+        data,
+        currentPage,
+        totalPages,
+        total,
+        hasNext,
+        hasPrev
+      };
+    } catch (error) {
+      throw new Error("Error getting reports: ".concat(error.message));
+    }
+  });
+  return function getAllReports() {
+    return _ref.apply(this, arguments);
+  };
+}();
 var _default = exports.default = {
   getReport,
   createReport,
   updateReport,
-  deleteReport
+  deleteReport,
+  getAllReports
 };

package/dist/services/reservation.service.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reservationModel = _interopRequireDefault(require("../models/reservation.model.js"));
 var _bikeModel = _interopRequireDefault(require("../models/bike.model.js"));
+var _instructorScheduleService = _interopRequireDefault(require("./instructorSchedule.service.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -15,7 +16,6 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; } // MicroService/src/services/reservation.service.js
 // Needed to check bike status/location
-
 /**
  * Checks if a bike is already reserved for a specific timestamp.
  * @param {string} bikeId - The ID of the bike.
@@ -130,10 +130,12 @@ var createReservation = /*#__PURE__*/function () {
  * Gets the availability status of all bikes for a specific location and timestamp.
  * @param {string} location - The location ('Sambil Paraguaná' or 'C.C Las Virtudes').
  * @param {Date|string} timestamp - The UTC timestamp to check (Date object or valid date string).
+ * @param {boolean} includeInstructor - Whether to include instructor information.
  * @returns {Promise<Array<object>>} - An array of bike objects, each with an added 'reservationStatus' field.
  */
 var getBikeAvailabilityForSlot = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(function* (location, timestamp) {
+    var includeInstructor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var checkTimestamp = new Date(timestamp);
     if (isNaN(checkTimestamp.getTime())) {
       throw new Error('Timestamp inválido proporcionado para obtener disponibilidad.');
@@ -157,43 +159,65 @@ var getBikeAvailabilityForSlot = /*#__PURE__*/function () {
     // 3. Create a map of reserved bike IDs for quick lookup
     var reservedBikeMap = new Map();
     reservations.forEach(res => {
-      // Store the user info (or just true if user info isn't needed/allowed)
-      reservedBikeMap.set(res.bikeId.toString(), res.userId); // Store populated user object
+      // Store the user info and reservation ID
+      reservedBikeMap.set(res.bikeId.toString(), {
+        user: res.userId,
+        reservationId: res._id.toString()
+      });
     });
 
-    // 4. Combine bike data with reservation status
+    // 4. Get instructor information if requested
+    var instructorInfo = null;
+    if (includeInstructor) {
+      instructorInfo = yield _instructorScheduleService.default.getInstructorForTimestamp(location, checkTimestamp);
+    }
+
+    // 5. Combine bike data with reservation status
     var bikesWithStatus = bikesInLocation.map(bike => {
       var bikeIdStr = bike._id.toString();
-      var reservedByUser = reservedBikeMap.get(bikeIdStr);
+      var reservationData = reservedBikeMap.get(bikeIdStr);
       var reservationStatus;
       if (bike.isInstructorBike) {
+        // For instructor bike, include instructor name if available
+        var instructorName = instructorInfo ? instructorInfo.instructorName : null;
         reservationStatus = {
           status: 'instructor',
-          reservedBy: null
+          reservedBy: null,
+          reservationId: null,
+          instructorName: instructorName
         };
-      } else if (reservedByUser) {
-        // For admin: include user details. For regular user, this might be simplified later.
+      } else if (reservationData) {
+        // For admin: include user details and reservation ID
         reservationStatus = {
           status: 'agendada',
-          reservedBy: reservedByUser
+          reservedBy: reservationData.user,
+          reservationId: reservationData.reservationId
         };
       } else if (bike.status === 'Disponible') {
         // Check the bike's general status
         reservationStatus = {
           status: 'disponible',
-          reservedBy: null
+          reservedBy: null,
+          reservationId: null
         };
       } else {
         // If bike's general status is 'No Disponible' or something else
         reservationStatus = {
           status: 'no_disponible_general',
-          reservedBy: null
+          reservedBy: null,
+          reservationId: null
         };
       }
-      return _objectSpread(_objectSpread({}, bike), {}, {
+      var result = _objectSpread(_objectSpread({}, bike), {}, {
         // Spread original bike data
         reservationStatus // Add the specific status for this slot
       });
+
+      // Add instructor name directly to instructor bikes for easier access
+      if (bike.isInstructorBike && instructorInfo) {
+        result.instructorName = instructorInfo.instructorName;
+      }
+      return result;
     });
     return bikesWithStatus;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstars-services",
-  "version": "1.0.59", 
+  "version": "1.0.61", 
   "description": "This is the services layer for GoldStars",
   "main": "./dist/index.js",
   "scripts": {