added preferredFaculty to Users

src/client/pages/InventionDisclosure.tsx

@@ -1,22 +1,18 @@
 import React from 'react'
-import { Box, Grid } from '@mui/material'
+import { Box, Grid, Typography } from '@mui/material'
 
 import InformationChip from '../components/Chip/InformationChip'
-import styles from '../styles'
 
-const InventionDisclosurePage = () => {
-  const { formStyles } = styles
-
-  return (
-    <Box sx={formStyles.formWrapper}>
-      <Grid container>
-        <InformationChip
-          title='Invention Disclosure'
-          label='disclosure'
-          link='/invention_disclosure'
-        />
-      </Grid>
-    </Box>
-  )
-}
+const InventionDisclosurePage = () => (
+  <Box>
+    <Grid container>
+      <InformationChip
+        title='Invention Disclosure'
+        label='disclosure'
+        link='/invention_disclosure'
+      />
+    </Grid>
+    <Typography variant='h2'>Hej</Typography>
+  </Box>
+)
 export default InventionDisclosurePage

src/server/db/migrations/20240318_00_add_preffered_faculty_to_user.ts

@@ -0,0 +1,14 @@
+import { DataTypes } from 'sequelize'
+
+import { Migration } from '../connection'
+
+export const up: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.addColumn('users', 'preferred_faculty', {
+    type: DataTypes.STRING,
+    allowNull: true,
+  })
+}
+
+export const down: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.removeColumn('users', 'preferred_faculty')
+}

src/server/db/models/User.ts

@@ -23,6 +23,8 @@ class User extends Model<InferAttributes<User>, InferCreationAttributes<User>> {
   declare lastLoggedIn: Date
 
   declare isAdmin: boolean
+
+  declare preferredFaculty: string
 }
 
 User.init(
@@ -56,6 +58,10 @@ User.init(
       allowNull: false,
       defaultValue: false,
     },
+    preferredFaculty: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
   },
   {
     underscored: true,

src/server/db/seeders/user.ts

@@ -9,6 +9,7 @@ const user = {
   language: 'fi',
   isAdmin: true,
   lastLoggedIn: new Date(),
+  preferredFaculty: 'H50',
 }
 
 const seedUsers = async () => {

src/server/types.ts

@@ -26,6 +26,7 @@ export interface User {
   isAdmin: boolean
   iamGroups: string[]
   newUser?: boolean
+  preferredFaculty: string
 }
 
 export interface RequestWithUser extends Request {

src/server/util/oicd.ts

@@ -10,6 +10,7 @@ import passport from 'passport'
 
 import { User } from '../db/models'
 import NotFoundError from '../errors/NotFoundError'
+import { getUserFaculties } from '../services/faculty'
 import { User as UserType, UserInfo } from '../types'
 
 import {
@@ -66,6 +67,8 @@ const verifyLogin = async (
     family_name: lastName,
   } = userinfo as unknown as UserInfo
 
+  const userPreferedFaculty = await getUserFaculties(id, iamGroups)
+
   const user: UserType = {
     username,
     id: id || username,
@@ -75,6 +78,7 @@ const verifyLogin = async (
     firstName,
     lastName,
     isAdmin: checkAdmin(iamGroups) || username === 'glandmic',
+    preferredFaculty: userPreferedFaculty[0].code || 'OTHER',
   }
 
   await User.upsert({