Replace implementation of upcoming-exams endpoint

src/controllers/courses.ts

@@ -3,7 +3,6 @@ import { Router } from 'express'
 import Course, { CourseDocument } from '@/models/course'
 import Exam from '@/models/exam'
 import User from '@/models/user'
-import helper from '@/utils/helper'
 import ExamAttempt from '@/models/exam-attempt'
 
 const coursesRouter = Router()
@@ -156,7 +155,7 @@ coursesRouter.get('/:course/exams/week/:week', async (req, res) => {
   res.json(exams)
 })
 
-coursesRouter.get('/v2/:id/upcoming-exams', async (req, res) => {
+coursesRouter.get('/:id/upcoming-exams', async (req, res) => {
   const exams = await Exam.find({
     course: req.params.id,
     startDate: {
@@ -167,20 +166,6 @@ coursesRouter.get('/v2/:id/upcoming-exams', async (req, res) => {
   res.json(exams)
 })
 
-coursesRouter.get('/:id/upcoming-exams', async (req, res) => {
-  const course = await Course.findById(req.params.id)
-
-  if (!course) {
-    res.status(404).end()
-    return
-  }
-
-  const exams = await Exam.find({ _id: { $in: course.exams } })
-  const events = await helper.getEvents(exams)
-
-  res.json(events)
-})
-
 coursesRouter.put('/:courseId', async (req, res) => {
   const body = req.body
   const course = await Course.findById(req.params.courseId)

src/controllers/users.ts

@@ -9,7 +9,6 @@ import ExamAttempt from '@/models/exam-attempt'
 import Exam from '@/models/exam'
 import Course from '@/models/course'
 import { Event } from '@/types'
-import helper from '@/utils/helper'
 import config from '@/utils/config'
 
 const usersRouter = Router()
@@ -148,7 +147,7 @@ usersRouter.delete('/:id', async (req, res) => {
   res.status(204).end()
 })
 
-usersRouter.get('/v2/:id/upcoming-exams', async (req, res) => {
+usersRouter.get('/:id/upcoming-exams', async (req, res) => {
   const user = await User.findById(req.params.id)
 
   if (!user) {
@@ -191,24 +190,6 @@ usersRouter.get('/:id/open-exams', async (req, res) => {
   res.json(exams)
 })
 
-/**
- * @deprecated Use /v2/:id/upcoming-exams instead
- */
-usersRouter.get('/:id/upcoming-exams', async (req, res) => {
-  const user = await User.findById(req.params.id)
-
-  if (!user) {
-    res.status(404).end()
-    return
-  }
-
-  const exams = await Exam.find({ course: { $in: user.courses } })
-
-  const events = await helper.getEvents(exams)
-
-  res.json(events)
-})
-
 usersRouter.get('/:id/recent-activity', async (req, res) => {
   const user = await User.findById(req.params.id)