refactor: Few more files to täsä

Author: Veikkosuhonen

src/server/models/organisation.ts

@@ -10,6 +10,7 @@ import {
   InferAttributes,
   InferCreationAttributes,
   CreationOptional,
+  HasManyGetAssociationsMixin,
 } from 'sequelize'
 import type { LocalizedString } from '@common/types/common'
 import { sequelize } from '../db/dbConnection'
@@ -18,6 +19,7 @@ import type { CourseUnit } from './courseUnit'
 import type { CourseRealisationsOrganisation } from './courseRealisationsOrganisation'
 import type { Tag } from './tag'
 import { CourseUnitsOrganisation } from './courseUnitsOrganisation'
+import type { User } from './user'
 
 class Organisation extends Model<InferAttributes<Organisation>, InferCreationAttributes<Organisation>> {
   // --- Acual DB columns ---
@@ -44,6 +46,8 @@ class Organisation extends Model<InferAttributes<Organisation>, InferCreationAtt
   declare tags?: Tag[]
   declare childOrganisations?: Organisation[]
 
+  declare getUsers: HasManyGetAssociationsMixin<User>
+
   // --- Helper methods ---
   // ----------------------
   async getCourseCodes() {

src/server/models/user.ts

@@ -9,6 +9,7 @@ import {
   InferCreationAttributes,
   CreationOptional,
   HasManyGetAssociationsMixin,
+  HasManyHasAssociationMixin,
 } from 'sequelize'
 import _ from 'lodash'
 import { LanguageId } from '@common/types/common'
@@ -47,6 +48,7 @@ class User extends Model<InferAttributes<User>, InferCreationAttributes<User>> {
   declare iamGroups?: string[]
 
   declare getOrganisations: HasManyGetAssociationsMixin<Organisation>
+  declare hasOrganisation: HasManyHasAssociationMixin<Organisation, string>
 
   async isTeacher() {
     const teachings = await UserFeedbackTarget.findAll({

…tions/feedbackCorrespondentController.js …tions/feedbackCorrespondentController.tssrc/server/routes/organisations/feedbackCorrespondentController.js renamed to src/server/routes/organisations/feedbackCorrespondentController.ts src/server/routes/organisations/feedbackCorrespondentController.js renamed to src/server/routes/organisations/feedbackCorrespondentController.ts

@@ -1,11 +1,12 @@
-const { Router } = require('express')
-const { User, OrganisationFeedbackCorrespondent } = require('../../models')
-const { ApplicationError } = require('../../util/customErrors')
-const { getAccessAndOrganisation } = require('./util')
-const { createOrganisationLog } = require('../../services/auditLog')
-const { ENABLE_CORRESPONDENT_MANAGEMENT } = require('../../util/config')
-
-const addOrganisationFeedbackCorrespondent = async (req, res) => {
+import { Response, Router } from 'express'
+import { User, OrganisationFeedbackCorrespondent } from '../../models'
+import { ApplicationError } from '../../util/customErrors'
+import { getAccessAndOrganisation } from './util'
+import { createOrganisationLog } from '../../services/auditLog'
+import { ENABLE_CORRESPONDENT_MANAGEMENT } from '../../util/config'
+import { AuthenticatedRequest } from '../../types'
+
+const addOrganisationFeedbackCorrespondent = async (req: AuthenticatedRequest, res: Response) => {
   const { user } = req
   const { code } = req.params
   const { userId } = req.body
@@ -16,10 +17,10 @@ const addOrganisationFeedbackCorrespondent = async (req, res) => {
 
   const userToAdd = await User.findByPk(userId)
   if (!userToAdd) {
-    throw new ApplicationError(`User not found`, 400)
+    throw new ApplicationError('User not found', 400)
   }
   if (await userToAdd.hasOrganisation(organisation)) {
-    throw new ApplicationError(`User already is feedback correspondent of that organisation`, 400)
+    throw new ApplicationError('User already is feedback correspondent of that organisation', 400)
   }
 
   await OrganisationFeedbackCorrespondent.create({
@@ -36,10 +37,10 @@ const addOrganisationFeedbackCorrespondent = async (req, res) => {
 
   const users = await organisation.getUsers()
 
-  return res.send(users)
+  res.send(users)
 }
 
-const removeOrganisationFeedbackCorrespondent = async (req, res) => {
+const removeOrganisationFeedbackCorrespondent = async (req: AuthenticatedRequest, res: Response) => {
   const { user } = req
   const { code, userId } = req.params
 
@@ -70,14 +71,12 @@ const removeOrganisationFeedbackCorrespondent = async (req, res) => {
 
   const users = await organisation.getUsers()
 
-  return res.send(users)
+  res.send(users)
 }
 
-const router = Router()
+export const router = Router()
 
 if (ENABLE_CORRESPONDENT_MANAGEMENT) {
   router.post('/:code/feedback-correspondents', addOrganisationFeedbackCorrespondent)
   router.delete('/:code/feedback-correspondents/:userId', removeOrganisationFeedbackCorrespondent)
 }
-
-module.exports = router

src/server/routes/tags/index.js

@@ -0,0 +1 @@
+export { router as tagsRouter } from './tags'