format

Author: MatiasSinisalo

src/client/components/Courses/Course/index.tsx

@@ -101,7 +101,7 @@ const Course = () => {
   const handleAddResponsible = async (e) => {
     e.preventDefault()
     const username = e.target.username.value
-    apiClient.post(`/courses/${course.id}/responsibilities/assign`, {username: username})
+    apiClient.post(`/courses/${course.id}/responsibilities/assign`, { username: username })
   }
   return (
     <Container sx={{ mt: '4rem', mb: '10rem' }} maxWidth="xl">
@@ -187,22 +187,19 @@ const Course = () => {
                 {showTeachers ? t('admin:hideTeachers') : t('admin:showTeachers')}
               </Button>
               {showTeachers && (
-              <Box>
-                <Form onSubmit={handleAddResponsible}>
-                  <TextField name="username" placeholder={"käyttäjänimi: "}></TextField>
-                  <Button type={"submit"}>
-                    Lisää
-                   </Button>
-
+                <Box>
+                  <Form onSubmit={handleAddResponsible}>
+                    <TextField name="username" placeholder={'käyttäjänimi: '}></TextField>
+                    <Button type={'submit'}>Lisää</Button>
                   </Form>
-                <ul>
-                  {course.responsibilities.map((responsibility) => (
-                    <li key={responsibility.id}>
-                      {responsibility.user.last_name} {responsibility.user.first_names}
-                    </li>
-                  ))}
-                </ul>
-              </Box>
+                  <ul>
+                    {course.responsibilities.map((responsibility) => (
+                      <li key={responsibility.id}>
+                        {responsibility.user.last_name} {responsibility.user.first_names}
+                      </li>
+                    ))}
+                  </ul>
+                </Box>
               )}
             </>
           )}

src/client/hooks/useChatScroll.ts

@@ -83,8 +83,7 @@ export const useChatScroll = (appContainerRef, endOfConversationRef) => {
   }
 
   const smoothScrollTo = (duration: number) => {
-    if(!shouldScroll.current)
-    {
+    if (!shouldScroll.current) {
       return
     }
     //should scroll but there might be another scroll frame going so first it should be cancelled

src/client/hooks/useUpdateUrlLang.tsx

@@ -10,7 +10,7 @@ export const useUpdateUrlLang = () => {
   const { user } = useCurrentUser()
   const [params, setParams] = useSearchParams()
   const langParam = params.get('lang')
- const [lang, setStorageLang] = useLocalStorageState('lang', 'en')
+  const [lang, setStorageLang] = useLocalStorageState('lang', 'en')
   useEffect(() => {
     const updatedLangFromLocal = localStorage.getItem('lang')
 

src/server/db/migrations/20250804_00_add_created_by_user_id_column.ts

@@ -11,5 +11,5 @@ export const up: Migration = async ({ context: queryInterface }) => {
 }
 
 export const down: Migration = async ({ context: queryInterface }) => {
-  await queryInterface.removeColumn('responsibilities','created_by_user_id')
+  await queryInterface.removeColumn('responsibilities', 'created_by_user_id')
 }

src/server/db/models/responsibilities.ts

@@ -31,10 +31,11 @@ Responsibility.init(
       type: DataTypes.STRING,
       allowNull: false,
     },
-    createdByUserId: { // tells who manually created the responsibility, (null = created by updater)
+    createdByUserId: {
+      // tells who manually created the responsibility, (null = created by updater)
       type: DataTypes.STRING,
-      allowNull: true
-    }
+      allowNull: true,
+    },
   },
   {
     underscored: true,

src/server/routes/course.ts

@@ -164,17 +164,16 @@ courseRouter.get('/:id/enrolments', async (req: express.Request, res: express.Re
 
 //checks if user is a admin or is responsible for the course, returns forbidden error if not
 const enforceUserHasFullAccess = async (user, chatInstance) => {
- const isResponsibleForCourse = userAssignedAsResponsible(user.id, chatInstance)
- const hasFullAccess = user.isAdmin || isResponsibleForCourse
- if (!hasFullAccess) {
+  const isResponsibleForCourse = userAssignedAsResponsible(user.id, chatInstance)
+  const hasFullAccess = user.isAdmin || isResponsibleForCourse
+  if (!hasFullAccess) {
     throw ApplicationError.Forbidden('Unauthorized')
   }
   return hasFullAccess
 }
 
 // returns a chatInstance, throws an chat instacne not found if not found
 const getChatInstance = async (id) => {
- 
   const chatInstance = await ChatInstance.findOne({
     where: { courseId: id },
     include: [
@@ -309,87 +308,84 @@ courseRouter.put('/:id', async (req, res) => {
   res.send(chatInstance)
 })
 
- const userAssignedAsResponsible =  (userId, chatInstance) => {
-  console.log("looking for: " + userId)
-  const isResponsible:boolean = chatInstance.responsibilities
-      ?.map((r) => {console.log(r); return r.user?.id})
-      .filter(Boolean)
-      .includes(userId)
+const userAssignedAsResponsible = (userId, chatInstance) => {
+  console.log('looking for: ' + userId)
+  const isResponsible: boolean = chatInstance.responsibilities
+    ?.map((r) => {
+      console.log(r)
+      return r.user?.id
+    })
+    .filter(Boolean)
+    .includes(userId)
   return isResponsible
- }
-
-
- const getUser = async(id: string) => {
- 
-    const user = await User.findByPk(id)
-    if(!user){
-     throw ApplicationError.NotFound('User not found')
-     return null
-    }
-    return user
- }
+}
 
+const getUser = async (id: string) => {
+  const user = await User.findByPk(id)
+  if (!user) {
+    throw ApplicationError.NotFound('User not found')
+    return null
+  }
+  return user
+}
 
 const getUserByUsername = async (username: string) => {
-  
- const user = await User.findOne({
-   where: {
-     username: username
-   },
-   raw: true
- })
- return user
+  const user = await User.findOne({
+    where: {
+      username: username,
+    },
+    raw: true,
+  })
+  return user
 }
 courseRouter.post('/:id/responsibilities/assign', async (req, res) => {
- const chatInstanceId = req.params.id
- const body = req.body as {
-   username : string
- }
- const assignedUserUsername:string = body.username
-
- const chatInstanceIdClean = cleanIdStringSchema.safeParse(chatInstanceId)
- if(!chatInstanceIdClean.success){
-   res.status(400).send('Malformed chat instance id')
-   return
- }
- //username also must be of similar format as the id only letters and numbers
- const assignedUserUsernameClean = cleanIdStringSchema.safeParse(assignedUserUsername)
- if(!assignedUserUsernameClean.success){
-   res.status(400).send('Malformed assigned user id')
-   return
- }
-
- const request = req as unknown as RequestWithUser
-const {user} = request
- const chatInstance = await getChatInstance(chatInstanceId)
- const hasPermission = await enforceUserHasFullAccess(user, chatInstanceId)
-
- const userToAssign = await getUserByUsername(assignedUserUsername)
- if(!userToAssign){
-   res.status(400).send('User not found with username')
-   return
- }
-
- const assignedUserId = userToAssign.id
- const userAssignedAlready = await userAssignedAsResponsible(assignedUserId, chatInstance)
- if(userAssignedAlready){
-   res.status(400).send('User is already responsible for the course')
-   return
- }
-
- if(hasPermission && userToAssign && !userAssignedAlready){
+  const chatInstanceId = req.params.id
+  const body = req.body as {
+    username: string
+  }
+  const assignedUserUsername: string = body.username
+
+  const chatInstanceIdClean = cleanIdStringSchema.safeParse(chatInstanceId)
+  if (!chatInstanceIdClean.success) {
+    res.status(400).send('Malformed chat instance id')
+    return
+  }
+  //username also must be of similar format as the id only letters and numbers
+  const assignedUserUsernameClean = cleanIdStringSchema.safeParse(assignedUserUsername)
+  if (!assignedUserUsernameClean.success) {
+    res.status(400).send('Malformed assigned user id')
+    return
+  }
+
+  const request = req as unknown as RequestWithUser
+  const { user } = request
+  const chatInstance = await getChatInstance(chatInstanceId)
+  const hasPermission = await enforceUserHasFullAccess(user, chatInstanceId)
+
+  const userToAssign = await getUserByUsername(assignedUserUsername)
+  if (!userToAssign) {
+    res.status(400).send('User not found with username')
+    return
+  }
+
+  const assignedUserId = userToAssign.id
+  const userAssignedAlready = await userAssignedAsResponsible(assignedUserId, chatInstance)
+  if (userAssignedAlready) {
+    res.status(400).send('User is already responsible for the course')
+    return
+  }
+
+  if (hasPermission && userToAssign && !userAssignedAlready) {
     const createdResponsibility = await Responsibility.create({
       userId: assignedUserId,
       chatInstanceId: chatInstance.id,
-      createdByUserId: user.id
+      createdByUserId: user.id,
     })
 
     res.json(createdResponsibility)
     return
   }
-   res.status(500).send('Unknown error occurred')
+  res.status(500).send('Unknown error occurred')
 })
 
-
-
 export default courseRouter

src/server/util/zodSchemas.ts

@@ -1,5 +1,5 @@
-import { z } from 'zod';
+import { z } from 'zod'
 
 export const cleanIdStringSchema = z.string().regex(/^[a-zA-Z0-9]+$/, {
   message: 'String must only contain letters',
-});
+})