goldstars-services 1.0.42 → 1.0.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +6 -6
- package/dist/services/reservation.service.js +58 -62
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
Object.defineProperty(exports, "ReservationService", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: function get() {
|
|
9
|
+
return _reservation.default;
|
|
10
|
+
}
|
|
11
|
+
});
|
|
6
12
|
Object.defineProperty(exports, "TransactionService", {
|
|
7
13
|
enumerable: true,
|
|
8
14
|
get: function get() {
|
|
@@ -51,12 +57,6 @@ Object.defineProperty(exports, "reportService", {
|
|
|
51
57
|
return _report.default;
|
|
52
58
|
}
|
|
53
59
|
});
|
|
54
|
-
Object.defineProperty(exports, "reservationService", {
|
|
55
|
-
enumerable: true,
|
|
56
|
-
get: function get() {
|
|
57
|
-
return _reservation.default;
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
60
|
var _db = _interopRequireDefault(require("./db"));
|
|
61
61
|
var _user = _interopRequireDefault(require("./services/user.service"));
|
|
62
62
|
var _config = _interopRequireDefault(require("./services/config.service"));
|
|
@@ -6,16 +6,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.getBikeAvailabilityForSlot = exports.createReservation = exports.cancelReservation = void 0;
|
|
7
7
|
var _reservationModel = _interopRequireDefault(require("../models/reservation.model.js"));
|
|
8
8
|
var _bikeModel = _interopRequireDefault(require("../models/bike.model.js"));
|
|
9
|
-
var _mongoose = _interopRequireDefault(require("mongoose"));
|
|
10
9
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
|
-
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; }
|
|
12
|
-
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; }
|
|
13
|
-
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; }
|
|
14
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
15
|
-
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); }
|
|
16
10
|
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); }
|
|
17
11
|
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
|
|
18
12
|
// Needed to check bike status/location
|
|
13
|
+
|
|
19
14
|
/**
|
|
20
15
|
* Checks if a bike is already reserved for a specific date and time slot.
|
|
21
16
|
* @param {string} bikeId - The ID of the bike.
|
|
@@ -101,64 +96,65 @@ var createReservation = exports.createReservation = /*#__PURE__*/function () {
|
|
|
101
96
|
* @param {Date} date - The date to check.
|
|
102
97
|
* @returns {Promise<Array<object>>} - An array of bike objects, each with an added 'reservationStatus' field.
|
|
103
98
|
*/
|
|
99
|
+
// Comentado el código existente para simplificar la función y probar la exportación
|
|
100
|
+
/*
|
|
101
|
+
export const getBikeAvailabilityForSlot = async (location, date) => {
|
|
102
|
+
// 1. Find all bikes for the given location
|
|
103
|
+
const bikesInLocation = await Bike.find({ location }).lean(); // .lean() for plain JS objects
|
|
104
|
+
|
|
105
|
+
// 2. Find all reservations for the specific date
|
|
106
|
+
const reservations = await Reservation.find({
|
|
107
|
+
date,
|
|
108
|
+
location, // Filter by location as well for efficiency
|
|
109
|
+
// Optional: Add status filter if needed
|
|
110
|
+
// status: 'confirmed',
|
|
111
|
+
})
|
|
112
|
+
.populate('userId', 'name email') // Populate user name/email for admin view
|
|
113
|
+
.lean();
|
|
114
|
+
|
|
115
|
+
// 3. Create a map of reserved bike IDs for quick lookup
|
|
116
|
+
const reservedBikeMap = new Map();
|
|
117
|
+
reservations.forEach(res => {
|
|
118
|
+
// Store the user info (or just true if user info isn't needed/allowed)
|
|
119
|
+
reservedBikeMap.set(res.bikeId.toString(), res.userId); // Store populated user object
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
// 4. Combine bike data with reservation status
|
|
123
|
+
const bikesWithStatus = bikesInLocation.map(bike => {
|
|
124
|
+
const bikeIdStr = bike._id.toString();
|
|
125
|
+
const reservedByUser = reservedBikeMap.get(bikeIdStr);
|
|
126
|
+
let reservationStatus;
|
|
127
|
+
|
|
128
|
+
if (bike.isInstructorBike) {
|
|
129
|
+
reservationStatus = { status: 'instructor', reservedBy: null };
|
|
130
|
+
} else if (reservedByUser) {
|
|
131
|
+
// For admin: include user details. For regular user, this might be simplified later.
|
|
132
|
+
reservationStatus = { status: 'agendada', reservedBy: reservedByUser };
|
|
133
|
+
} else if (bike.status === 'Disponible') { // Check the bike's general status
|
|
134
|
+
reservationStatus = { status: 'disponible', reservedBy: null };
|
|
135
|
+
} else {
|
|
136
|
+
// If bike's general status is 'No Disponible' or something else
|
|
137
|
+
reservationStatus = { status: 'no_disponible_general', reservedBy: null };
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
return {
|
|
141
|
+
...bike, // Spread original bike data
|
|
142
|
+
reservationStatus, // Add the specific status for this slot
|
|
143
|
+
};
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
return bikesWithStatus;
|
|
147
|
+
};
|
|
148
|
+
*/
|
|
149
|
+
|
|
150
|
+
// Nueva implementación simplificada para probar la exportación
|
|
104
151
|
var getBikeAvailabilityForSlot = exports.getBikeAvailabilityForSlot = /*#__PURE__*/function () {
|
|
105
152
|
var _ref3 = _asyncToGenerator(function* (location, date) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
location
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
// 2. Find all reservations for the specific date
|
|
112
|
-
var reservations = yield _reservationModel.default.find({
|
|
113
|
-
date,
|
|
114
|
-
location // Filter by location as well for efficiency
|
|
115
|
-
// Optional: Add status filter if needed
|
|
116
|
-
// status: 'confirmed',
|
|
117
|
-
}).populate('userId', 'name email') // Populate user name/email for admin view
|
|
118
|
-
.lean();
|
|
119
|
-
|
|
120
|
-
// 3. Create a map of reserved bike IDs for quick lookup
|
|
121
|
-
var reservedBikeMap = new Map();
|
|
122
|
-
reservations.forEach(res => {
|
|
123
|
-
// Store the user info (or just true if user info isn't needed/allowed)
|
|
124
|
-
reservedBikeMap.set(res.bikeId.toString(), res.userId); // Store populated user object
|
|
125
|
-
});
|
|
126
|
-
|
|
127
|
-
// 4. Combine bike data with reservation status
|
|
128
|
-
var bikesWithStatus = bikesInLocation.map(bike => {
|
|
129
|
-
var bikeIdStr = bike._id.toString();
|
|
130
|
-
var reservedByUser = reservedBikeMap.get(bikeIdStr);
|
|
131
|
-
var reservationStatus;
|
|
132
|
-
if (bike.isInstructorBike) {
|
|
133
|
-
reservationStatus = {
|
|
134
|
-
status: 'instructor',
|
|
135
|
-
reservedBy: null
|
|
136
|
-
};
|
|
137
|
-
} else if (reservedByUser) {
|
|
138
|
-
// For admin: include user details. For regular user, this might be simplified later.
|
|
139
|
-
reservationStatus = {
|
|
140
|
-
status: 'agendada',
|
|
141
|
-
reservedBy: reservedByUser
|
|
142
|
-
};
|
|
143
|
-
} else if (bike.status === 'Disponible') {
|
|
144
|
-
// Check the bike's general status
|
|
145
|
-
reservationStatus = {
|
|
146
|
-
status: 'disponible',
|
|
147
|
-
reservedBy: null
|
|
148
|
-
};
|
|
149
|
-
} else {
|
|
150
|
-
// If bike's general status is 'No Disponible' or something else
|
|
151
|
-
reservationStatus = {
|
|
152
|
-
status: 'no_disponible_general',
|
|
153
|
-
reservedBy: null
|
|
154
|
-
};
|
|
155
|
-
}
|
|
156
|
-
return _objectSpread(_objectSpread({}, bike), {}, {
|
|
157
|
-
// Spread original bike data
|
|
158
|
-
reservationStatus // Add the specific status for this slot
|
|
159
|
-
});
|
|
160
|
-
});
|
|
161
|
-
return bikesWithStatus;
|
|
153
|
+
return {
|
|
154
|
+
message: "Function is being called successfully",
|
|
155
|
+
location,
|
|
156
|
+
date
|
|
157
|
+
};
|
|
162
158
|
});
|
|
163
159
|
return function getBikeAvailabilityForSlot(_x5, _x6) {
|
|
164
160
|
return _ref3.apply(this, arguments);
|