Skip to content
Open
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
33 changes: 33 additions & 0 deletions backend/src/controllers/course.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import { formatError, getLogger } from "../utils/logger";
import { IController } from "../interfaces/IController";
import { CourseService } from "../services/course.service";
import verifyToken from "../api/middlewares/auth";
import validationMiddleware from "../api/middlewares/validation";
import {
BookmarkCourse,
BookmarkCourseSchema,
} from "../api/schemas/course.schema";
import { HTTPError } from "../utils/errors";
import { badRequest } from "../utils/constants";

export class CourseController implements IController {
private readonly logger = getLogger();
Expand Down Expand Up @@ -188,6 +195,32 @@ export class CourseController implements IController {
}
},
)
.post(
"/courses/bookmark",
[verifyToken, validationMiddleware(BookmarkCourseSchema, "body")],
async (
req: Request<Record<string, never>, unknown, BookmarkCourse>,
res: Response,
next: NextFunction,
) => {
this.logger.debug(`Received request in POST /courses/bookmark`);
try {
const courseDetails = req.body;
if (!courseDetails) throw new HTTPError(badRequest);
const result =
await this.courseService.bookmarkCourse(courseDetails);
this.logger.info(`Responding to client in POST /courses/bookmark`);
return res.status(200).json(result);
} catch (err: any) {
this.logger.warn(
`An error occurred when trying to POST /courses/bookmark ${formatError(
err,
)}`,
);
return next(err);
}
},
)
.delete(
"/cached/flush",
async (
Expand Down
23 changes: 19 additions & 4 deletions backend/src/repositories/user.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,29 @@ export class UserRepository {
return rawUser;
}

async updateUser(user: { zid: string; bookmarkedReviews: string[] }) {
async updateUser(user: {
zid: string;
bookmarkedReviews?: string[];
bookmarkedCourses?: string[];
}) {
const updateData: {
bookmarkedReviews?: string[];
bookmarkedCourses?: string[];
} = {};

if (user.bookmarkedReviews !== undefined) {
updateData.bookmarkedReviews = user.bookmarkedReviews;
}

if (user.bookmarkedCourses !== undefined) {
updateData.bookmarkedCourses = user.bookmarkedCourses;
}

const updatedUser = await this.prisma.users.update({
where: {
zid: user.zid,
},
data: {
bookmarkedReviews: user.bookmarkedReviews,
},
data: updateData,
});
return updatedUser;
}
Expand Down
54 changes: 54 additions & 0 deletions backend/src/services/course.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { CourseRepository } from "../repositories/course.repository";
import { UserRepository } from "../repositories/user.repository";
import RedisClient from "../modules/redis";
import {
BookmarkCourse,
Course,
CourseBody,
CoursesSuccessResponse,
Expand Down Expand Up @@ -218,4 +219,57 @@ export class CourseService {

await this.redis.flushAll();
}

async bookmarkCourse(
courseDetails: BookmarkCourse,
): Promise<CourseBody | undefined> {
const course = await this.courseRepository.getCourse(
courseDetails.courseCode,
);

if (!course) {
this.logger.error(
`There is no course with courseCode ${courseDetails.courseCode}.`,
);
throw new HTTPError(badRequest);
}

const user = await this.userRepository.getUser(courseDetails.zid);

if (!user) {
this.logger.error(`There is no user with zid ${courseDetails.zid}.`);
throw new HTTPError(badRequest);
}

if (!user.bookmarkedCourses) {
user.bookmarkedCourses = [];
}

if (courseDetails.bookmark) {
// Only add if not already bookmarked
if (!user.bookmarkedCourses.includes(course.courseCode)) {
user.bookmarkedCourses.push(course.courseCode);
}
} else {
user.bookmarkedCourses = user.bookmarkedCourses.filter(
(courseCode) => courseCode !== courseDetails.courseCode,
);
}

await this.userRepository.updateUser({
zid: user.zid,
bookmarkedCourses: user.bookmarkedCourses,
});

this.logger.info(
`Successfully ${
courseDetails.bookmark ? "bookmarked" : "removed bookmarked"
} course with courseCode ${courseDetails.courseCode} for user with zID ${
courseDetails.zid
}.`,
);
return {
course: course,
};
}
}