Fix tsc errors

Author: AleksTeresh

src/server/index.ts

@@ -17,7 +17,9 @@ import { updateLastRestart } from './util/lastRestart'
 const app = express()
 
 app.use('/api', (req, res, next) => router(req, res, next))
-app.use('/api', (_, res) => res.sendStatus(404))
+app.use('/api', (_, res) => {
+  res.sendStatus(404)
+})
 
 if (inProduction || inStaging) {
   const DIST_PATH = path.resolve(

src/server/routes/admin.ts

@@ -41,7 +41,10 @@ adminRouter.post('/chatinstances', async (req, res) => {
   const { name, description, model, usageLimit, courseId } = data
 
   const course = await getCourse(courseId)
-  if (!course) return res.status(404).send('Invalid course id')
+  if (!course) {
+    res.status(404).send('Invalid course id')
+    return
+  }
 
   const newChatInstance = await ChatInstance.create({
     name: { en: name, fi: name, sv: name },
@@ -52,7 +55,7 @@ adminRouter.post('/chatinstances', async (req, res) => {
     activityPeriod: course.activityPeriod,
   })
 
-  return res.status(201).send(newChatInstance)
+  res.status(201).send(newChatInstance)
 })
 
 const getUsages = async () => {
@@ -154,7 +157,7 @@ adminRouter.get('/statistics', async (req, res) => {
     return datas
   }
 
-  return res.send({
+  res.send({
     data: await mangelStats(),
     terms,
   })
@@ -175,7 +178,10 @@ adminRouter.put('/chatinstances/:id', async (req, res) => {
 
   const chatInstance = await ChatInstance.findByPk(id)
 
-  if (!chatInstance) return res.status(404).send('ChatInstance not found')
+  if (!chatInstance) {
+    res.status(404).send('ChatInstance not found')
+    return
+  }
 
   chatInstance.name = { en: name, fi: name, sv: name }
   chatInstance.description = description
@@ -185,23 +191,26 @@ adminRouter.put('/chatinstances/:id', async (req, res) => {
 
   await chatInstance.save()
 
-  return res.send(chatInstance)
+  res.send(chatInstance)
 })
 
 adminRouter.delete('/chatinstances/:id', async (req, res) => {
   const { id } = req.params
 
   const chatInstance = await ChatInstance.findByPk(id)
 
-  if (!chatInstance) return res.status(404).send('ChatInstance not found')
+  if (!chatInstance) {
+    res.status(404).send('ChatInstance not found')
+    return
+  }
 
   await UserChatInstanceUsage.destroy({
     where: { chatInstanceId: id },
   })
 
   await chatInstance.destroy()
 
-  return res.status(204).send()
+  res.status(204).send()
 })
 
 adminRouter.get('/chatinstances/usage', async (_, res) => {
@@ -218,28 +227,30 @@ adminRouter.get('/chatinstances/usage', async (_, res) => {
     ],
   })
 
-  return res.send(usage)
+  res.send(usage)
 })
 
 adminRouter.delete('/chatinstances/usage/:id', async (req, res) => {
   const { id } = req.params
 
   const chatInstanceUsage = await UserChatInstanceUsage.findByPk(id)
 
-  if (!chatInstanceUsage)
-    return res.status(404).send('ChatInstance usage not found')
+  if (!chatInstanceUsage) {
+    res.status(404).send('ChatInstance usage not found')
+    return
+  }
 
   await chatInstanceUsage.destroy()
 
-  return res.status(204).send()
+  res.status(204).send()
 })
 
 adminRouter.get('/users', async (_, res) => {
   const usage = await User.findAll({
     attributes: ['id', 'username', 'iamGroups', 'usage'],
   })
 
-  return res.send(usage)
+  res.send(usage)
 })
 
 adminRouter.get('/users/:search', async (req, res) => {
@@ -285,21 +296,23 @@ adminRouter.get('/users/:search', async (req, res) => {
     limit: 20,
   })
 
-  return res.send(matches)
+  res.send(matches)
 })
 
 adminRouter.delete('/usage/:userId', async (req, res) => {
   const { userId } = req.params
 
   const user = await User.findByPk(userId)
 
-  if (!user) return res.status(404).send('User not found')
+  if (!user) {
+    res.status(404).send('User not found')
+  }
 
   user.usage = 0
 
   await user.save()
 
-  return res.status(204).send()
+  res.status(204).send()
 })
 
 adminRouter.get('/user-search', async (req, res) => {
@@ -328,7 +341,7 @@ adminRouter.get('/user-search', async (req, res) => {
     limit: 20,
   })
 
-  return res.send({
+  res.send({
     params,
     persons: persons.map((person) => ({
       ...person.dataValues,
@@ -339,7 +352,7 @@ adminRouter.get('/user-search', async (req, res) => {
 
 adminRouter.post('/run-updater', async (req, res) => {
   runUpdater()
-  return res.send('Updater started')
+  res.send('Updater started')
 })
 
 adminRouter.put('/info-texts/:id', async (req, res) => {
@@ -353,7 +366,7 @@ adminRouter.put('/info-texts/:id', async (req, res) => {
 
   await infoText.save()
 
-  return res.send(infoText)
+  res.send(infoText)
 })
 
 export default adminRouter

src/server/routes/chatInstance.ts

@@ -79,25 +79,31 @@ chatInstanceRouter.get('/', async (req, res) => {
     ],
   })
 
-  return res.send({ chatInstances, count })
+  res.send({ chatInstances, count })
 })
 
 chatInstanceRouter.get('/:id', async (req, res) => {
   const { id } = req.params
 
   const chatInstance = await ChatInstance.findByPk(id)
 
-  if (!chatInstance) return res.status(404).send('ChatInstance not found')
+  if (!chatInstance) {
+    res.status(404).send('ChatInstance not found')
+    return
+  }
 
-  return res.send(chatInstance)
+  res.send(chatInstance)
 })
 
 chatInstanceRouter.post('/:id/enable', async (req, res) => {
   const { id } = req.params
 
   const chatInstance = await ChatInstance.findByPk(id)
 
-  if (!chatInstance) return res.status(404).send('ChatInstance not found')
+  if (!chatInstance) {
+    res.status(404).send('ChatInstance not found')
+    return
+  }
 
   const defaultActivityPeriod = {
     startDate: chatInstance.activityPeriod.startDate,
@@ -110,21 +116,24 @@ chatInstanceRouter.post('/:id/enable', async (req, res) => {
 
   await chatInstance.save()
 
-  return res.send(chatInstance)
+  res.send(chatInstance)
 })
 
 chatInstanceRouter.post('/:id/disable', async (req, res) => {
   const { id } = req.params
 
   const chatInstance = await ChatInstance.findByPk(id)
 
-  if (!chatInstance) return res.status(404).send('ChatInstance not found')
+  if (!chatInstance) {
+    res.status(404).send('ChatInstance not found')
+    return
+  }
 
   chatInstance.usageLimit = 0
 
   await chatInstance.save()
 
-  return res.send(chatInstance)
+  res.send(chatInstance)
 })
 
 chatInstanceRouter.get('/:id/usages', async (req, res) => {
@@ -153,22 +162,24 @@ chatInstanceRouter.get('/:id/usages', async (req, res) => {
     ],
   })
 
-  return res.status(200).send(usage)
+  res.status(200).send(usage)
 })
 
 chatInstanceRouter.delete('/usage/:id', async (req, res) => {
   const { id } = req.params
 
   const chatInstanceUsage = await UserChatInstanceUsage.findByPk(id)
 
-  if (!chatInstanceUsage)
-    return res.status(404).send('ChatInstance usage not found')
+  if (!chatInstanceUsage) {
+    res.status(404).send('ChatInstance usage not found')
+    return
+  }
 
   chatInstanceUsage.usageCount = 0
 
   chatInstanceUsage.save()
 
-  return res.status(204).send()
+  res.status(204).send()
 })
 
 export default chatInstanceRouter

src/server/routes/course.ts

@@ -27,7 +27,7 @@ const getCourses = async () => {
 courseRouter.get('/', async (_, res) => {
   const courses = await getCourses()
 
-  return res.send(courses)
+  res.send(courses)
 })
 
 courseRouter.get('/user', async (req, res) => {
@@ -56,7 +56,7 @@ courseRouter.get('/user', async (req, res) => {
     isExpired: Date.parse(chatinstance.activityPeriod.endDate) < Date.now(),
   }))
 
-  return res.send({ courses: coursesWithExtra, count })
+  res.send({ courses: coursesWithExtra, count })
 })
 
 courseRouter.get('/statistics/:id', async (req, res) => {
@@ -91,7 +91,7 @@ courseRouter.get('/statistics/:id', async (req, res) => {
     usageCount: (usage.usageCount / chatInstance.usageLimit) * 100,
   }))
 
-  return res.send({ average, usagePercentage, usages: normalizedUsage })
+  res.send({ average, usagePercentage, usages: normalizedUsage })
 })
 
 interface AcualResponsibility {
@@ -163,7 +163,7 @@ courseRouter.get('/:id', async (req, res) => {
         responsibilities: undefined,
       }
 
-  return res.send(objectToReturn)
+  res.send(objectToReturn)
 })
 
 courseRouter.put('/:id', async (req, res) => {
@@ -186,7 +186,7 @@ courseRouter.put('/:id', async (req, res) => {
 
   await chatInstance.save()
 
-  return res.send(chatInstance)
+  res.send(chatInstance)
 })
 
 export default courseRouter

src/server/routes/email.ts

@@ -9,7 +9,7 @@ emailRouter.post('/', async (req, res) => {
 
   const response = await sendEmail([to], text, subject)
 
-  return res.send(response)
+  res.send(response)
 })
 
 export default emailRouter

src/server/routes/faculty.ts

@@ -29,7 +29,7 @@ facultyRouter.get('/', async (_, res) => {
     iams: facultyIamsMap[code] || [],
   }))
 
-  return res.send(faculties)
+  res.send(faculties)
 })
 
 export default facultyRouter

src/server/routes/index.ts

@@ -29,7 +29,9 @@ router.use(userMiddleware)
 
 router.use(accessLogger)
 
-router.get('/ping', (_, res) => res.send('pong'))
+router.get('/ping', (_, res) => {
+  res.send('pong')
+})
 
 router.use('/ai', openaiRouter)
 router.use('/users', userRouter)

src/server/routes/infotext.ts

@@ -6,9 +6,12 @@ const infoTextRouter = express.Router()
 infoTextRouter.get('/', async (req, res) => {
   const infoTexts = await InfoText.findAll()
 
-  if (!infoTexts) return res.status(404).send('InfoTexts not found')
+  if (!infoTexts) {
+    res.status(404).send('InfoTexts not found')
+    return
+  }
 
-  return res.send(infoTexts)
+  res.send(infoTexts)
 })
 
 export default infoTextRouter