goldstars-services 1.0.48 → 1.0.50

package/dist/models/reservation.model.js

@@ -24,13 +24,6 @@ var reservationSchema = new _mongoose.default.Schema({
     // Store the specific date of the reservation
     required: true
   },
-  timeSlot: {
-    type: String,
-    // e.g., "7am", "5pm", "9:15am"
-    required: true
-    // Consider adding an enum later for validation if needed
-    // enum: ['7am', '8am', '9:15am', '5pm', '7pm']
-  },
   location: {
     type: String,
     // e.g., "Sambil", "Las Virtudes"

package/dist/services/reservation.service.js

@@ -17,49 +17,57 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 // 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) {
@@ -68,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);
   };
 }();
@@ -162,7 +169,7 @@ var getBikeAvailabilityForSlot = /*#__PURE__*/function () {
     });
     return bikesWithStatus;
   });
-  return function getBikeAvailabilityForSlot(_x5, _x6) {
+  return function getBikeAvailabilityForSlot(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -202,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);
   };
 }();
@@ -210,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.48", 
+  "version": "1.0.50", 
   "description": "This is the services layer for GoldStars",
   "main": "./dist/index.js",
   "scripts": {