app/controllers/colles_controller.ts

@@ -1,5 +1,4 @@
 import Colle from '#models/colle'
-import User from '#models/user'
 import { ColleService } from '#services/colle_service'
 import { NotificationService } from '#services/notification_service'
 import { createColleValidator, createUpcomingCollesValidator } from '#validators/colle'
@@ -39,7 +38,7 @@ export default class CollesController {
       return response.badRequest({ message: 'Invalid colle ID' })
     }
     // Retrieve the colle by ID
-    let colle = await Colle.query()
+    const colle = await Colle.query()
       .where('id', colleId)
       .whereHas('student', (query) => {
         query.where('className', auth.user!.className)
@@ -50,28 +49,6 @@ export default class CollesController {
       .preload('room')
       .preload('attachments')
       .first()
-
-    let className = auth.user!.className
-
-    // If colle not found and user has a past student ID, try with the past student's class
-    if (!colle && auth.user!.pastStudentId) {
-      const pastUser = await User.find(auth.user!.pastStudentId)
-      if (pastUser) {
-        className = pastUser.className
-        colle = await Colle.query()
-          .where('id', colleId)
-          .whereHas('student', (query) => {
-            query.where('className', pastUser.className)
-          })
-          .preload('student')
-          .preload('examiner')
-          .preload('subject')
-          .preload('room')
-          .preload('attachments')
-          .first()
-      }
-    }
-
     if (!colle) {
       return response.notFound({ message: 'Colle not found' })
     }
@@ -82,7 +59,7 @@ export default class CollesController {
       .where('id', '!=', colle.id) // Exclude the current colle
       .where('examinerId', colle.examinerId)
       .whereHas('student', (query) => {
-        query.where('className', className)
+        query.where('className', auth.user!.className)
       })
       .preload('student')
 
@@ -104,28 +81,12 @@ export default class CollesController {
     }
 
     // Retrieve the colle by ID
-    let colle = await Colle.query()
+    const colle = await Colle.query()
       .where('id', colleId)
       .whereHas('student', (query) => {
         query.where('className', auth.user!.className)
       })
       .first()
-
-    let className = auth.user!.className
-
-    if (!colle && auth.user!.pastStudentId) {
-      const pastUser = await User.find(auth.user!.pastStudentId)
-      if (pastUser) {
-        className = pastUser.className
-        colle = await Colle.query()
-          .where('id', colleId)
-          .whereHas('student', (query) => {
-            query.where('className', pastUser.className)
-          })
-          .first()
-      }
-    }
-
     if (!colle) {
       return response.notFound({ message: 'Colle not found' })
     }
@@ -138,7 +99,7 @@ export default class CollesController {
           type: 0, // Refresh colle
           colle_id: colle.bjid,
           colle_secret: colle.bjsecret,
-          class_name: className,
+          class_name: auth.user!.className,
         })
       )
     } else {
@@ -148,7 +109,7 @@ export default class CollesController {
         JSON.stringify({
           type: 1, // Search for colles on a specific day
           date: colle.date.toFormat('dd/MM/yyyy'),
-          class_name: className,
+          class_name: auth.user!.className,
         })
       )
     }

app/controllers/user_controller.ts

@@ -10,16 +10,11 @@ export default class UserController {
 
   // GET /users/@me
   async me({ auth }: HttpContext) {
-    const user = auth.user!
     return {
       success: true,
       data: {
-        ...user.serialize(),
-        firstName: user.firstName,
-        lastName: user.lastName,
-        email: user.email,
-        preferences: user.preferences,
-        pastStudentId: user.pastStudentId,
+        ...auth.user?.serialize(),
+        email: auth.user!.email || '',
       },
     }
   }
@@ -57,14 +52,7 @@ export default class UserController {
     await user.save()
     return {
       success: true,
-      data: {
-        ...user.serialize(),
-        firstName: user.firstName,
-        lastName: user.lastName,
-        email: user.email,
-        preferences: user.preferences,
-        pastStudentId: user.pastStudentId,
-      },
+      data: user,
     }
   }
 
@@ -82,14 +70,7 @@ export default class UserController {
       return response.notFound({ message: 'User not found' })
     }
 
-    return {
-      success: true,
-      data: {
-        ...user.serialize(),
-        preferences: user.preferences,
-        pastStudentId: user.pastStudentId,
-      },
-    }
+    return { success: true, data: user }
   }
 
   // POST /merge-student
@@ -100,13 +81,6 @@ export default class UserController {
     user.pastStudentId = pastStudentId
     await user.save()
 
-    return {
-      success: true,
-      data: {
-        ...user.serialize(),
-        preferences: user.preferences,
-        pastStudentId: user.pastStudentId,
-      },
-    }
+    return { success: true, data: user }
   }
 }

app/models/user.ts

@@ -1,14 +1,55 @@
 import { DateTime } from 'luxon'
 import { BaseModel, column, computed } from '@adonisjs/lucid/orm'
 import { DbRememberMeTokensProvider } from '@adonisjs/auth/session'
+import { HttpContext } from '@adonisjs/core/http'
 
 export default class User extends BaseModel {
+  serializeExtras = true
+
+  serialize() {
+    const ctx = HttpContext.get()
+
+    if (!ctx) {
+      this.serializeExtras = false
+      const serialized = super.serialize()
+      delete serialized.pastStudentId
+      delete serialized.extras
+      return serialized
+    }
+
+    const requestUrl = ctx.request.url()
+    const isUsersRoute = requestUrl.startsWith('/users')
+    const isMeRoute = requestUrl.includes('/users/@me')
+
+    this.serializeExtras = isUsersRoute
+
+    const serialized = super.serialize()
+    if (!isUsersRoute) {
+      delete serialized.pastStudentId
+      delete serialized.extras
+    }
+
+    if (isMeRoute) {
+      console.log('Serializing full name for /users/@me route')
+      serialized.firstName = this.firstName
+      serialized.lastName = this.lastName
+    }
+
+    if (this.serializeExtras) {
+      serialized.preferences = this.preferences
+    } else {
+      delete serialized.preferences
+    }
+
+    return serialized
+  }
+
   static rememberMeTokens = DbRememberMeTokensProvider.forModel(User)
 
   @column({ isPrimary: true })
   declare id: number
 
-  @column({ serializeAs: null })
+  @column()
   declare pastStudentId: number | null
 
   @column()
@@ -31,8 +72,9 @@ export default class User extends BaseModel {
   @column({ serializeAs: null })
   declare extras: Record<string, any>
 
-  @computed({ serializeAs: null })
+  @computed()
   get preferences(): { name: string; emoji: string; color: string }[] {
+    if (!this.serializeExtras) return []
     return this.extras?.preferences || []
   }