goldstars-services 1.0.45 → 1.0.49

package/dist/services/reservation.service.js

@@ -7,54 +7,67 @@ exports.default = void 0;
 var _reservationModel = _interopRequireDefault(require("../models/reservation.model.js"));
 var _bikeModel = _interopRequireDefault(require("../models/bike.model.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; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 date and time slot.
+ * Checks if a bike is already reserved for a specific timestamp.
  * @param {string} bikeId - The ID of the bike.
- * @param {Date} date - The reservation date.
- * @param {string} timeSlot - The reservation time slot.
+ * @param {Date} timestamp - The reservation timestamp (UTC Date object).
  * @returns {Promise<boolean>} - True if the bike is already reserved, false otherwise.
  */
 var isBikeReserved = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(function* (bikeId, date, timeSlot) {
+  var _ref = _asyncToGenerator(function* (bikeId, timestamp) {
+    // Ensure timestamp is treated as a Date object if it comes as a string
+    var searchTimestamp = new Date(timestamp);
+    if (isNaN(searchTimestamp.getTime())) {
+      throw new Error('Timestamp inválido proporcionado a isBikeReserved.');
+    }
     var existingReservation = yield _reservationModel.default.findOne({
       bikeId,
-      date,
-      timeSlot
+      timestamp: searchTimestamp // Use the timestamp directly
       // Optional: Add status check if cancelled reservations should allow re-booking
       // status: 'confirmed',
     });
     return !!existingReservation;
   });
-  return function isBikeReserved(_x, _x2, _x3) {
+  return function isBikeReserved(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
 
 /**
- * Creates a new reservation.
+ * Creates a new reservation using a timestamp.
  * @param {object} reservationData - Data for the new reservation.
  * @param {string} reservationData.userId - User ID.
  * @param {string} reservationData.bikeId - Bike ID.
- * @param {Date} reservationData.date - Reservation date.
- * @param {string} reservationData.timeSlot - Reservation time slot.
+ * @param {Date|string} reservationData.timestamp - Reservation timestamp (UTC Date object or valid date string).
  * @param {string} reservationData.location - Reservation location.
  * @returns {Promise<object>} - The created reservation document.
- * @throws {Error} - If bike not found, is instructor bike, or already reserved.
+ * @throws {Error} - If bike not found, is instructor bike, timestamp invalid, or already reserved.
  */
 var createReservation = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(function* (reservationData) {
+    // Destructure timestamp, remove date and timeSlot
     var {
       userId,
       bikeId,
-      date,
-      timeSlot,
+      timestamp,
       location
     } = reservationData;
 
+    // Validate timestamp
+    var reservationTimestamp = new Date(timestamp);
+    if (isNaN(reservationTimestamp.getTime())) {
+      throw new Error('Timestamp inválido proporcionado para la reserva.');
+    }
+
     // 1. Validate Bike
     var bike = yield _bikeModel.default.findById(bikeId);
     if (!bike) {
@@ -63,29 +76,28 @@ var createReservation = /*#__PURE__*/function () {
     if (bike.isInstructorBike) {
       throw new Error('La bicicleta del instructor no se puede reservar.');
     }
-    // Ensure the bike belongs to the specified location (optional but good practice)
     if (bike.location !== location) {
       throw new Error("La bicicleta ".concat(bike.name, " no pertenece a la ubicaci\xF3n ").concat(location, "."));
     }
 
-    // 2. Check if already reserved
-    var alreadyReserved = yield isBikeReserved(bikeId, date, timeSlot);
+    // 2. Check if already reserved using timestamp
+    var alreadyReserved = yield isBikeReserved(bikeId, reservationTimestamp);
     if (alreadyReserved) {
       throw new Error('Esta bicicleta ya está reservada para esta fecha y hora.');
     }
 
-    // 3. Create Reservation (Add userId validation if needed)
+    // 3. Create Reservation using timestamp
     var newReservation = new _reservationModel.default({
       userId,
       bikeId,
-      date,
-      timeSlot,
+      timestamp: reservationTimestamp,
+      // Use timestamp
       location
     });
     yield newReservation.save();
     return newReservation;
   });
-  return function createReservation(_x4) {
+  return function createReservation(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -97,70 +109,76 @@ var createReservation = /*#__PURE__*/function () {
  * @returns {Promise<Array<object>>} - An array of bike objects, each with an added 'reservationStatus' field.
  */
 // Comentado el código existente para simplificar la función y probar la exportación
-/*
-const getBikeAvailabilityForSlot = async (location, date) => {
-  // 1. Find all bikes for the given location
-  const bikesInLocation = await Bike.find({ location }).lean(); // .lean() for plain JS objects
-
-  // 2. Find all reservations for the specific date
-  const reservations = await Reservation.find({
-    date,
-    location, // Filter by location as well for efficiency
-    // Optional: Add status filter if needed
-    // status: 'confirmed',
-  })
-  .populate('userId', 'name email') // Populate user name/email for admin view
-  .lean();
-
-  // 3. Create a map of reserved bike IDs for quick lookup
-  const 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
-  });
-
-  // 4. Combine bike data with reservation status
-  const bikesWithStatus = bikesInLocation.map(bike => {
-    const bikeIdStr = bike._id.toString();
-    const reservedByUser = reservedBikeMap.get(bikeIdStr);
-    let reservationStatus;
-
-    if (bike.isInstructorBike) {
-      reservationStatus = { status: 'instructor', reservedBy: null };
-    } else if (reservedByUser) {
-      // For admin: include user details. For regular user, this might be simplified later.
-      reservationStatus = { status: 'agendada', reservedBy: reservedByUser };
-    } else if (bike.status === 'Disponible') { // Check the bike's general status
-        reservationStatus = { status: 'disponible', reservedBy: null };
-    } else {
-        // If bike's general status is 'No Disponible' or something else
-        reservationStatus = { status: 'no_disponible_general', reservedBy: null };
-    }
-
-    return {
-      ...bike, // Spread original bike data
-      reservationStatus, // Add the specific status for this slot
-    };
-  });
-
-  return bikesWithStatus;
-};
-*/
 
-// Nueva implementación simplificada para probar la exportación
 var getBikeAvailabilityForSlot = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(function* (location, date) {
-    return {
-      message: "Function is being called successfully",
-      location,
-      date
-    };
+    // 1. Find all bikes for the given location
+    var bikesInLocation = yield _bikeModel.default.find({
+      location
+    }).lean(); // .lean() for plain JS objects
+
+    // 2. Find all reservations for the specific date
+    var reservations = yield _reservationModel.default.find({
+      date,
+      location // Filter by location as well for efficiency
+      // Optional: Add status filter if needed
+      // status: 'confirmed',
+    }).populate('userId', 'name email') // Populate user name/email for admin view
+    .lean();
+
+    // 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
+    });
+
+    // 4. Combine bike data with reservation status
+    var bikesWithStatus = bikesInLocation.map(bike => {
+      var bikeIdStr = bike._id.toString();
+      var reservedByUser = reservedBikeMap.get(bikeIdStr);
+      var reservationStatus;
+      if (bike.isInstructorBike) {
+        reservationStatus = {
+          status: 'instructor',
+          reservedBy: null
+        };
+      } else if (reservedByUser) {
+        // For admin: include user details. For regular user, this might be simplified later.
+        reservationStatus = {
+          status: 'agendada',
+          reservedBy: reservedByUser
+        };
+      } else if (bike.status === 'Disponible') {
+        // Check the bike's general status
+        reservationStatus = {
+          status: 'disponible',
+          reservedBy: null
+        };
+      } else {
+        // If bike's general status is 'No Disponible' or something else
+        reservationStatus = {
+          status: 'no_disponible_general',
+          reservedBy: null
+        };
+      }
+      return _objectSpread(_objectSpread({}, bike), {}, {
+        // Spread original bike data
+        reservationStatus // Add the specific status for this slot
+      });
+    });
+    return bikesWithStatus;
   });
-  return function getBikeAvailabilityForSlot(_x5, _x6) {
+  return function getBikeAvailabilityForSlot(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();
 
+// Nueva implementación simplificada para probar la exportación
+/* const getBikeAvailabilityForSlot = async (location, date) => {
+  return { message: "Function is being called successfully", location, date };
+};
+ */
 // Optional: Add functions for cancelling or fetching user-specific reservations later
 /**
  * Cancels a reservation.
@@ -191,7 +209,7 @@ var cancelReservation = /*#__PURE__*/function () {
       message: 'Reserva cancelada exitosamente.'
     };
   });
-  return function cancelReservation(_x7, _x8, _x9) {
+  return function cancelReservation(_x6, _x7, _x8) {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -199,5 +217,5 @@ var _default = exports.default = {
   getBikeAvailabilityForSlot,
   createReservation,
   cancelReservation,
-  isBikeReserved
+  isBikeReserved // Keep exporting isBikeReserved if used elsewhere, otherwise could be removed if only internal
 };

package/package.json

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