Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACL-126] Feat/Bookings #55

Merged
merged 2 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions backend/src/controllers/booking.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { Request, Response } from 'express';
import { ResponseStatusCodes } from '../types/ResponseStatusCodes.types';
import { logger } from '../middlewares/logger.middleware';
import Validator from '../utils/Validator.utils';
import bookingRepo from '../database/repositories/booking.repo';

class BookingController {
async bookItinerary(req: Request, res: Response) {
try {
Validator.validateId(req.body.itinerary_id, 'incorrect itinerary id');

const booking = await bookingRepo.bookItinerary(req.user.userId, req.body.itinerary_id);

const response = {
message: 'Booking successful',
data: { booking: booking },
};

res.status(ResponseStatusCodes.CREATED).send(response);
} catch (error: any) {
logger.error(`Error occurred while booking itinerary: ${error.message}`);
res.status(ResponseStatusCodes.INTERNAL_SERVER_ERROR).send({
message: `Error occurred while booking itinerary: ${error.message}`,
});
}
}

async bookActivity(req: Request, res: Response) {
try {
Validator.validateId(req.body.activity_id, 'incorrect activity id');

const booking = await bookingRepo.bookActivity(req.user.userId, req.body.activity_id);

const response = {
message: 'Booking successful',
data: { booking: booking },
};

res.status(ResponseStatusCodes.CREATED).send(response);
} catch (error: any) {
logger.error(`Error occurred while booking activity: ${error.message}`);
res.status(ResponseStatusCodes.INTERNAL_SERVER_ERROR).send({
message: `Error occurred while booking activity: ${error.message}`,
});
}
}
}

export default new BookingController();
31 changes: 31 additions & 0 deletions backend/src/database/models/booking.model.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { model, Schema } from 'mongoose';

const bookingSchema = new Schema(
{
user: {
type: Schema.Types.ObjectId,
ref: 'user',
required: true,
},
itinerary: {
type: Schema.Types.ObjectId,
ref: 'itinerary',
},
activity: {
type: Schema.Types.ObjectId,
ref: 'activity',
},
status: {
type: String,
enum: ['pending', 'confirmed', 'attended', 'cancelled'],
default: 'pending',
},
},
{
timestamps: true,
}
);

const Booking = model('booking', bookingSchema);

export { bookingSchema, Booking };
6 changes: 6 additions & 0 deletions backend/src/database/models/user.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ const userSchema = new mongoose.Schema(
average_rating: {
type: Number,
},
itinerary_bookings: {
type: [{ type: Schema.Types.ObjectId, ref: 'booking' }],
},
activity_bookings: {
type: [{ type: Schema.Types.ObjectId, ref: 'booking' }],
},
modified_by: {
type: Schema.Types.ObjectId,
ref: 'user',
Expand Down
20 changes: 20 additions & 0 deletions backend/src/database/repositories/booking.repo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Booking } from '../models/booking.model';
import { User } from '../models/user.model';

class BookingRepo {
async bookItinerary(userId: string, itineraryId: string) {
const booking = await Booking.create({ user: userId, itinerary: itineraryId });
await User.findByIdAndUpdate(userId, { $push: { itinerary_bookings: booking._id } });

return booking;
}

async bookActivity(userId: string, activityId: string) {
const booking = await Booking.create({ user: userId, activity: activityId });
await User.findByIdAndUpdate(userId, { $push: { activity_bookings: booking._id } });

return booking;
}
}

export default new BookingRepo();
3 changes: 3 additions & 0 deletions backend/src/routes/activity.route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import {
createActivity,
getActivitiesByCreator,
} from '../controllers/activity.controller';
import BookingController from '../controllers/booking.controller';

const activityRouter = Router();

activityRouter.post('/bookings', BookingController.bookActivity);

activityRouter.get('/', getAllActivities);
activityRouter.get('/mine', getActivitiesByCreator);
activityRouter.get('/:id', getActivityById);
Expand Down
3 changes: 3 additions & 0 deletions backend/src/routes/itinerary.route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ import {
toggleItineraryActive,
flagItinerary,
} from '../controllers/itinerary.controller';
import BookingController from '../controllers/booking.controller';

const itineraryRouter = Router();

itineraryRouter.post('/bookings', BookingController.bookItinerary);

itineraryRouter.get('/get', getItineraries);
itineraryRouter.get('/mine', getItinerariesCreatedByUser);
itineraryRouter.get('/:id', findItineraryById);
Expand Down
3 changes: 3 additions & 0 deletions backend/src/types/User.types.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { Types } from 'mongoose';

export enum accountType {
Admin = 'Admin',
Tourist = 'Tourist',
Expand Down Expand Up @@ -35,4 +37,5 @@ export interface UserType {
// Tourist
loyalty_points: number;
wallet?: number;
itinerary_bookings: [Types.ObjectId];
}