From 5121fd3e4d2357261975d333ceb370171042e09f Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Wed, 22 Apr 2026 15:06:14 +0200 Subject: [PATCH 01/10] update docs --- .../idatt/backend/classroom/domain/ClassroomPupilStatus.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilStatus.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilStatus.kt index e2b21e42..9d09edc3 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilStatus.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilStatus.kt @@ -1,10 +1,10 @@ package edu.ntnu.idi.idatt.backend.classroom.domain /** - * Enum representing the possible statuses for a classroom. + * Enum representing the possible statuses for a pupil membership. * - * - [ACTIVE]: The classroom is open and available for users to join and participate. - * - [INACTIVE]: The classroom is closed or archived and cannot be joined or used. + * - [ACTIVE]: The pupil has been approved. + * - [PENDING]: The pupil has not yet been approved. */ enum class ClassroomPupilStatus { ACTIVE, From 0b3a99d7137639edf91823132e3dad40feab1a8f Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Wed, 22 Apr 2026 18:31:46 +0200 Subject: [PATCH 02/10] save classroom in pupilProfile --- .../backend/bootstrap/DevDataBootstrap.kt | 10 +++--- .../classroom/api/ClassroomApiMappings.kt | 2 +- .../classroom/api/ClassroomResponse.kt | 4 +-- .../classroom/application/ClassroomService.kt | 7 ++++ .../iam/application/CurrentUserResolver.kt | 2 +- .../application/CurrentUserProfileService.kt | 4 +-- .../users/profile/domain/PupilProfile.kt | 11 +++--- .../backend/classroom/ClassroomServiceTest.kt | 35 ++++++++++++------- .../backend/iam/CurrentUserResolverTests.kt | 2 +- .../profile/CurrentUserProfileServiceTests.kt | 7 ++-- .../UserProfileControllerIntegrationTests.kt | 4 +-- 11 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt index 97186f9e..ac1076b2 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt @@ -104,8 +104,8 @@ class DevDataBootstrap( ) seedClassroomMembership(sampleClassroom, pupilAda, "Ada") seedClassroomMembership(sampleClassroom, pupilNoah, "Noah") - seedPupilProfile(pupilAda, "Ada", sampleClassroom.id) - seedPupilProfile(pupilNoah, "Noah", sampleClassroom.id) + seedPupilProfile(pupilAda, "Ada", sampleClassroom) + seedPupilProfile(pupilNoah, "Noah", sampleClassroom) seedPupilAvatar(pupilAda) seedPupilAvatar(pupilNoah) seedPupilGameProgress( @@ -224,13 +224,13 @@ class DevDataBootstrap( private fun seedPupilProfile( user: User, displayName: String, - currentClassroomId: Long?, + currentClassroom: Classroom?, ) { val userId = requireNotNull(user.id) { "Pupil seed user must have an id" } val existingProfile = pupilProfileRepository.findById(userId).orElse(null) if (existingProfile != null) { existingProfile.displayName = displayName - existingProfile.currentClassroomId = currentClassroomId + existingProfile.currentClassroom = currentClassroom return } @@ -238,7 +238,7 @@ class DevDataBootstrap( PupilProfile( user = user, displayName = displayName, - currentClassroomId = currentClassroomId, + currentClassroom = currentClassroom, ), ) } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt index edad66cc..5a9b7d9d 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt @@ -67,7 +67,7 @@ fun JoinClassroomResult.toJoinClassroomResponse(): JoinClassroomResponse = */ fun Classroom.toResponse(): ClassroomResponse = ClassroomResponse( - id = id, + classroomId = id, title = title, description = description, joinCode = joinCode ?: "", diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomResponse.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomResponse.kt index 6cd92255..399cb5b0 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomResponse.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomResponse.kt @@ -3,14 +3,14 @@ package edu.ntnu.idi.idatt.backend.classroom.api /** * DTO for response to classroom requests. * - * @param id the id of a classroom. + * @param classroomId the id of a classroom. * @param title the title of a classroom. * @param description the optional description of a classroom. * @param joinCode the code to join the classroom. * @param teacherUserIds a list of ids of teahcers belonging to the classroom. */ data class ClassroomResponse( - val id: Long, + val classroomId: Long, val title: String, val description: String?, val joinCode: String, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt index c746cad5..262f4889 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt @@ -12,6 +12,7 @@ import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository import edu.ntnu.idi.idatt.backend.iam.domain.UserRole +import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository import org.springframework.context.ApplicationEventPublisher import org.springframework.http.HttpStatus import org.springframework.stereotype.Service @@ -38,6 +39,7 @@ class ClassroomService( private val pupilGameProgressRepository: PupilGameProgressRepository, private val taskRepository: TaskRepository, private val eventPublisher: ApplicationEventPublisher, + private val pupilProfileRepository: PupilProfileRepository, ) { /** @@ -127,7 +129,12 @@ class ClassroomService( } classroom.addPupilMembership(user) + val profile = pupilProfileRepository.findById(userId) + .orElseThrow { ResponseStatusException(HttpStatus.NOT_FOUND, "Profile not found") } + profile.currentClassroom = classroom + pupilProfileRepository.save(profile) classroomRepository.save(classroom) + pupilGameProgressRepository.save( PupilGameProgress( id = PupilGameProgressId( diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt index 96800371..46cd5bb6 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt @@ -84,7 +84,7 @@ class CurrentUserResolver( .orElseThrow { ResponseStatusException(HttpStatus.NOT_FOUND, "Pupil profile was not found") } - val classroomId = pupilProfile.currentClassroomId + val classroomId = pupilProfile.currentClassroom?.id ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Pupil has no current classroom") classroomRepository.findById(classroomId) .orElseThrow { diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt index d1cda6f3..c9e830ea 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt @@ -39,7 +39,7 @@ class CurrentUserProfileService( .map { PupilProfileDetails( displayName = it.displayName, - currentClassroomId = it.currentClassroomId, + currentClassroomId = it.currentClassroom?.id, ) } .orElseThrow { @@ -94,7 +94,7 @@ class CurrentUserProfileService( return PupilProfileDetails( displayName = savedProfile.displayName, - currentClassroomId = savedProfile.currentClassroomId, + currentClassroomId = savedProfile.currentClassroom?.id, ) } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/domain/PupilProfile.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/domain/PupilProfile.kt index d52e74ed..5dfd6f9d 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/domain/PupilProfile.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/domain/PupilProfile.kt @@ -1,5 +1,6 @@ package edu.ntnu.idi.idatt.backend.users.profile.domain +import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom import edu.ntnu.idi.idatt.backend.iam.domain.User import jakarta.persistence.Column @@ -7,6 +8,7 @@ import jakarta.persistence.Entity import jakarta.persistence.FetchType import jakarta.persistence.Id import jakarta.persistence.JoinColumn +import jakarta.persistence.ManyToOne import jakarta.persistence.MapsId import jakarta.persistence.OneToOne import jakarta.persistence.Table @@ -17,7 +19,7 @@ import jakarta.persistence.Table * @property userId shared primary key matching the owning user id * @property user owning pupil user account * @property displayName pupil name shown in the product - * @property currentClassroomId current classroom id, or `null` when unassigned + * @property currentClassroom current classroom, or `null` when unassigned */ @Entity @Table(name = "pupil_profiles") @@ -31,8 +33,7 @@ class PupilProfile( var user: User, @Column(name = "display_name", nullable = false, length = 100) var displayName: String, - // TODO: replace with @ManyToOne/@JoinColumn when Classroom table exists - // this column references classrooms.id. - @Column(name = "current_classroom_id") - var currentClassroomId: Long? = null, + @ManyToOne(fetch = FetchType.LAZY, optional = true) + @JoinColumn(name = "current_classroom_id") + var currentClassroom: Classroom? = null, ) diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt index ad73dd55..25f872dc 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt @@ -19,6 +19,8 @@ import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository +import edu.ntnu.idi.idatt.backend.users.profile.domain.PupilProfile +import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.BeforeEach @@ -32,6 +34,7 @@ import org.springframework.context.ApplicationEventPublisher import org.springframework.http.HttpStatus import org.springframework.web.server.ResponseStatusException import org.mockito.Mockito.any +import java.util.Optional class ClassroomServiceTest { private lateinit var classroomRepository: ClassroomRepository @@ -42,6 +45,7 @@ class ClassroomServiceTest { private lateinit var classroomService: ClassroomService private lateinit var userRepository: UserRepository private lateinit var eventPublisher: ApplicationEventPublisher + private lateinit var pupilProfileRepository: PupilProfileRepository @BeforeEach fun setup() { @@ -52,6 +56,7 @@ class ClassroomServiceTest { pupilGameProgressRepository = mock(PupilGameProgressRepository::class.java) taskRepository = mock(TaskRepository::class.java) eventPublisher = mock(ApplicationEventPublisher::class.java) + pupilProfileRepository = mock(PupilProfileRepository::class.java) classroomService = ClassroomService( classroomRepository, currentUserResolver, @@ -60,19 +65,13 @@ class ClassroomServiceTest { pupilGameProgressRepository, taskRepository, eventPublisher, + pupilProfileRepository, ) } @Test fun `should create classroom and assign teacher`() { - val teacher = User( - id = 1, - email = "teacher@test.com", - username = "teacher", - passwordHash = "pw", - role = UserRole.TEACHER, - status = UserStatus.ACTIVE, - ) + val teacher = User(id = 1, email = "teacher@test.com", username = "teacher", passwordHash = "pw", role = UserRole.TEACHER, status = UserStatus.ACTIVE,) `when`(currentUserResolver.requireTeacherOrAdmin("1")).thenReturn(teacher) `when`(classroomRepository.save(any())).thenAnswer { it.arguments[0] } @@ -94,11 +93,16 @@ class ClassroomServiceTest { @Test fun `should add user to classroom`() { val classroomCode = "ABC12" + val classroom = Classroom(id = 1, ownerTeacherId = 2, title = "class", description = "description", joinCode = classroomCode, status = ClassroomStatus.ACTIVE) + val user = User(id = 3, email = "test@example.com", username = "user", passwordHash = "password", role = UserRole.PUPIL, status = UserStatus.ACTIVE) + val pupilProfile = PupilProfile(userId = 3, user = user, displayName = "test", currentClassroom = null,) + `when`(classroomRepository.findByJoinCode(classroomCode)).thenReturn(classroom) `when`(currentUserResolver.requirePupil("3")).thenReturn(user) + `when`(pupilProfileRepository.findById(3)).thenReturn(Optional.of(pupilProfile)) val command = JoinClassroomCommand(classroomCode = classroomCode, authenticatedSubject = "3") val result = classroomService.joinClassroom(command) @@ -107,9 +111,11 @@ class ClassroomServiceTest { assertEquals(1L, result.classroomId) assertEquals("class", result.classroomTitle) assertEquals("PENDING", result.membershipStatus) + verify(classroomRepository).save(classroom) verify(pupilGameProgressRepository).save(any(PupilGameProgress::class.java)) - verify(classroomRepository).findByJoinCode(classroomCode) + verify(pupilProfileRepository).save(pupilProfile) + assertEquals(classroom, pupilProfile.currentClassroom) } @Test @@ -233,19 +239,22 @@ class ClassroomServiceTest { @Test fun `should normalize classroom code before lookup`() { val classroom = Classroom(id = 1, ownerTeacherId = 2, title = "class", description = "description", joinCode = "ABC123", status = ClassroomStatus.ACTIVE) + val user = User(id = 3, email = "test@example.com", username = "user", passwordHash = "password", role = UserRole.PUPIL, status = UserStatus.ACTIVE) + val pupilProfile = PupilProfile(userId = 3, user = user, displayName = "test", currentClassroom = null,) + `when`(classroomRepository.findByJoinCode("ABC123")).thenReturn(classroom) `when`(currentUserResolver.requirePupil("3")).thenReturn(user) + `when`(pupilProfileRepository.findById(3)).thenReturn(Optional.of(pupilProfile)) classroomService.joinClassroom( - JoinClassroomCommand( - classroomCode = " abc123 ", - authenticatedSubject = "3", - ), + JoinClassroomCommand(classroomCode = " abc123 ", authenticatedSubject = "3"), ) verify(classroomRepository).findByJoinCode("ABC123") + verify(pupilProfileRepository).save(pupilProfile) + assertEquals(classroom, pupilProfile.currentClassroom) } @Test diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt index df452eb6..a11546b7 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt @@ -110,7 +110,7 @@ class CurrentUserResolverTests { userId = 11L, user = user, displayName = "Pupil One", - currentClassroomId = 101L, + currentClassroom = classroom, ) Mockito.`when`(userRepository.findById(11L)).thenReturn(Optional.of(user)) diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt index be26bee0..2d850c35 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt @@ -1,5 +1,6 @@ package edu.ntnu.idi.idatt.backend.users.profile +import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole @@ -24,6 +25,7 @@ class CurrentUserProfileServiceTests { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) + val classroom = Classroom(id = 101L, ownerTeacherId = 7L, title = "Class A") val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, @@ -33,7 +35,7 @@ class CurrentUserProfileServiceTests { val pupilProfile = PupilProfile( user = user, displayName = "Ada", - currentClassroomId = 101L, + currentClassroom = classroom, ).apply { userId = 42L } @@ -176,6 +178,7 @@ class CurrentUserProfileServiceTests { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) + val classroom = Classroom(id = 101L, ownerTeacherId = 7L, title = "Class A") val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, @@ -185,7 +188,7 @@ class CurrentUserProfileServiceTests { val pupilProfile = PupilProfile( user = user, displayName = "Ada", - currentClassroomId = 101L, + currentClassroom = classroom, ).apply { userId = 42L } diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt index 9c2c30fa..6288f9c6 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt @@ -75,7 +75,7 @@ class UserProfileControllerIntegrationTests { PupilProfile( user = pupil, displayName = "Ada", - currentClassroomId = classroom.id, + currentClassroom = classroom, ), ) @@ -145,7 +145,7 @@ class UserProfileControllerIntegrationTests { PupilProfile( user = pupil, displayName = "Ada", - currentClassroomId = classroom.id, + currentClassroom = classroom, ), ) From 4d07726fb3c3faee71ab814eec04c85749758020 Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Wed, 22 Apr 2026 18:42:34 +0200 Subject: [PATCH 03/10] fix --- .../users/profile/application/CurrentUserProfileService.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt index 14fc4ed6..f768e120 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/application/CurrentUserProfileService.kt @@ -40,7 +40,7 @@ class CurrentUserProfileService( val pupilProfile = if (user.role == UserRole.PUPIL) { pupilProfileRepository.findById(userId) .map { - val progress = getCurrentClassroomProgress(userId, it.currentClassroomId) + val progress = getCurrentClassroomProgress(userId, it.currentClassroom?.id) PupilProfileDetails( displayName = it.displayName, @@ -96,7 +96,7 @@ class CurrentUserProfileService( val user = currentUserResolver.requirePupil(authenticatedSubject) val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } val pupilProfile = findPupilProfile(userId) - val progress = getCurrentClassroomProgress(userId, pupilProfile.currentClassroomId) + val progress = getCurrentClassroomProgress(userId, pupilProfile.currentClassroom?.id) pupilProfile.displayName = command.displayName.trim() val savedProfile = pupilProfileRepository.save(pupilProfile) From 71f7a199ecd72513803c343a3f681778a5841ef7 Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Wed, 22 Apr 2026 18:48:50 +0200 Subject: [PATCH 04/10] fix tests --- .../NotebookEntryControllerIntegrationTests.kt | 12 ++++++------ .../users/profile/CurrentUserProfileServiceTests.kt | 7 ++++--- .../profile/UserProfileControllerIntegrationTests.kt | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/notebook/NotebookEntryControllerIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/notebook/NotebookEntryControllerIntegrationTests.kt index 423196d7..b831374c 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/notebook/NotebookEntryControllerIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/notebook/NotebookEntryControllerIntegrationTests.kt @@ -83,8 +83,8 @@ class NotebookEntryControllerIntegrationTests { ) val pupil = userRepository.save(activePupil("ada")) val otherPupil = userRepository.save(activePupil("grace")) - pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroomId = classroom.id)) - pupilProfileRepository.save(PupilProfile(user = otherPupil, displayName = "Grace", currentClassroomId = classroom.id)) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroom = classroom)) + pupilProfileRepository.save(PupilProfile(user = otherPupil, displayName = "Grace", currentClassroom = classroom)) notebookEntryRepository.save( NotebookEntry( pupil = pupil, @@ -130,7 +130,7 @@ class NotebookEntryControllerIntegrationTests { MapStop(slug = "intro", title = "Intro") ) val pupil = userRepository.save(activePupil("ada")) - pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroomId = classroom.id)) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroom = classroom)) val accessToken = pupilAccessToken("ada", "secret123") val body = readJson( @@ -172,7 +172,7 @@ class NotebookEntryControllerIntegrationTests { MapStop(slug = "intro", title = "Intro") ) val pupil = userRepository.save(activePupil("ada")) - pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroomId = classroom.id)) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroom = classroom)) val entry = notebookEntryRepository.save( NotebookEntry( pupil = pupil, @@ -212,8 +212,8 @@ class NotebookEntryControllerIntegrationTests { ) val pupil = userRepository.save(activePupil("ada")) val otherPupil = userRepository.save(activePupil("grace")) - pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroomId = classroom.id)) - pupilProfileRepository.save(PupilProfile(user = otherPupil, displayName = "Grace", currentClassroomId = classroom.id)) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "Ada", currentClassroom = classroom)) + pupilProfileRepository.save(PupilProfile(user = otherPupil, displayName = "Grace", currentClassroom = classroom)) val entry = notebookEntryRepository.save( NotebookEntry( pupil = otherPupil, diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt index 21c04de9..39dac74d 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/CurrentUserProfileServiceTests.kt @@ -78,7 +78,7 @@ class CurrentUserProfileServiceTests { val pupilProfile = PupilProfile( user = user, displayName = "Ada", - currentClassroomId = null, + currentClassroom = null, ).apply { userId = 42L } @@ -99,6 +99,7 @@ class CurrentUserProfileServiceTests { val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) + val classroom = Classroom(id = 101L, ownerTeacherId = 7L, title = "Class A") val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, @@ -109,14 +110,14 @@ class CurrentUserProfileServiceTests { val pupilProfile = PupilProfile( user = user, displayName = "Ada", - currentClassroomId = 101L, + currentClassroom = classroom, ).apply { userId = 42L } Mockito.`when`(currentUserResolver.requireUser("42")).thenReturn(user) Mockito.`when`(pupilProfileRepository.findById(42L)).thenReturn(Optional.of(pupilProfile)) - Mockito.`when`(pupilGameProgressRepository.findByPupilIdAndClassroomId(42L, 101L)).thenReturn(null) + Mockito.`when`(pupilGameProgressRepository.findByPupilIdAndClassroomId(42L, classroom.id)).thenReturn(null) val resolvedProfile = service.getCurrentUserProfile("42") diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt index 4aff649d..1d850d5b 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/users/profile/UserProfileControllerIntegrationTests.kt @@ -127,7 +127,7 @@ class UserProfileControllerIntegrationTests { PupilProfile( user = pupil, displayName = "Ada", - currentClassroomId = classroom.id, + currentClassroom = classroom, ), ) From 68f30ba1610edfa72898eba1a0b2373bc8880953 Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Thu, 23 Apr 2026 09:33:18 +0200 Subject: [PATCH 05/10] fix tests --- .../classroom/ClassroomIntegrationTests.kt | 75 +++++++++++-------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt index 66361c21..03f3c4ae 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt @@ -13,6 +13,7 @@ import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus import edu.ntnu.idi.idatt.backend.iam.infrastructure.RefreshTokenRepository import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository import edu.ntnu.idi.idatt.backend.users.avatar.infrastructure.UserAvatarRepository +import edu.ntnu.idi.idatt.backend.users.profile.domain.PupilProfile import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.TeacherProfileRepository import org.junit.jupiter.api.Assertions.assertEquals @@ -54,9 +55,6 @@ class ClassroomIntegrationTests { @Autowired private lateinit var userAvatarRepository: UserAvatarRepository - @Autowired - private lateinit var pupilProfileRepository: PupilProfileRepository - @Autowired private lateinit var teacherProfileRepository: TeacherProfileRepository @@ -66,6 +64,9 @@ class ClassroomIntegrationTests { @Autowired private lateinit var jdbcTemplate: JdbcTemplate + @Autowired + private lateinit var pupilProfileRepository: PupilProfileRepository + private val jsonMapper = JsonMapper.builder().build() @BeforeEach @@ -77,6 +78,7 @@ class ClassroomIntegrationTests { pupilProfileRepository.deleteAll() teacherProfileRepository.deleteAll() userRepository.deleteAll() + pupilProfileRepository.deleteAll() } @Test @@ -94,8 +96,10 @@ class ClassroomIntegrationTests { fun `authenticated pupil can join classroom`() { val classroom = createClassroom("CLASS42") val pupil = userRepository.save(activePupil(username = "ada")) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "ada", currentClassroom = classroom)) val accessToken = pupilAccessToken(username = "ada", password = "secret123") + mockMvc.post("/api/v1/classrooms/join") { with(csrf()) contentType = MediaType.APPLICATION_JSON @@ -109,6 +113,12 @@ class ClassroomIntegrationTests { jsonPath("$.message") { value("Join request submitted") } } + val updatedProfile = pupilProfileRepository + .findById(requireNotNull(pupil.id)) + .orElseThrow() + + assertEquals(classroom.id, updatedProfile.currentClassroom?.id) + val membershipCount = jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM classroom_pupils WHERE classroom_id = ? AND pupil_user_id = ?", Int::class.java, @@ -128,8 +138,9 @@ class ClassroomIntegrationTests { @Test fun `authenticated pupil can join classroom with padded lowercase code`() { - createClassroom("CLASS42") + val classroom = createClassroom("CLASS42") val pupil = userRepository.save(activePupil(username = "padding-check")) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "padding", currentClassroom = classroom)) val accessToken = pupilAccessToken(username = "padding-check", password = "secret123") mockMvc.post("/api/v1/classrooms/join") { @@ -143,6 +154,15 @@ class ClassroomIntegrationTests { jsonPath("$.membershipStatus") { value("PENDING") } } + val updatedProfile = pupilProfileRepository + .findById(requireNotNull(pupil.id)) + .orElseThrow() + + assertEquals( + classroomRepository.findByJoinCode("CLASS42")!!.id, + updatedProfile.currentClassroom?.id + ) + val membershipCount = jdbcTemplate.queryForObject( "SELECT COUNT(*) FROM classroom_pupils cp JOIN users u ON u.id = cp.pupil_user_id WHERE cp.classroom_id = (SELECT id FROM classrooms WHERE join_code = ?) AND u.username = ?", Int::class.java, @@ -163,28 +183,8 @@ class ClassroomIntegrationTests { @Test fun `teacher can list owned classrooms`() { val owner = userRepository.save(activeTeacher(email = "teacher-owned@example.com")) - classroomRepository.save( - Classroom( - ownerTeacherId = requireNotNull(owner.id), - title = "Alpha classroom", - description = "Owned by teacher", - joinCode = "OWN01", - status = ClassroomStatus.ACTIVE, - createdAt = Instant.now(), - updatedAt = Instant.now(), - ), - ) - classroomRepository.save( - Classroom( - ownerTeacherId = requireNotNull(owner.id), - title = "Beta classroom", - description = "Owned by teacher", - joinCode = "OWN02", - status = ClassroomStatus.ACTIVE, - createdAt = Instant.now(), - updatedAt = Instant.now(), - ), - ) + classroomRepository.save(Classroom(ownerTeacherId = requireNotNull(owner.id), title = "Alpha classroom", description = "Owned by teacher", joinCode = "OWN01", status = ClassroomStatus.ACTIVE, createdAt = Instant.now(), updatedAt = Instant.now(),),) + classroomRepository.save(Classroom(ownerTeacherId = requireNotNull(owner.id), title = "Beta classroom", description = "Owned by teacher", joinCode = "OWN02", status = ClassroomStatus.ACTIVE, createdAt = Instant.now(), updatedAt = Instant.now()),) createClassroom("OTHER1") val accessToken = teacherPortalAccessToken(email = "teacher-owned@example.com", password = "secret123") @@ -246,31 +246,35 @@ class ClassroomIntegrationTests { } @Test - fun `authenticated user can get all classrooms`() { - val classroom = createClassroom("LIST1") + fun `authenticated user can get classrooms`() { + val classroom = createClassroom("GET1") + val pupil = userRepository.save(activePupil(username = "getuser")) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "get", currentClassroom = classroom)) + val token = pupilAccessToken(username = "getuser", password = "secret123") mockMvc.post("/api/v1/classrooms/join") { with(csrf()) contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${pupilAccessToken("listuser", "secret123")}") - content = """{"classroomCode":"LIST1"}""" + header(HttpHeaders.AUTHORIZATION, "Bearer $token") + content = """{"classroomCode":"GET1"}""" }.andExpect { status { isOk() } } mockMvc.get("/api/v1/classrooms") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${pupilAccessToken("listuser", "secret123")}") + header(HttpHeaders.AUTHORIZATION, "Bearer $token") }.andExpect { status { isOk() } - jsonPath("$[0].id") { value(classroom.id.toInt()) } + jsonPath("$[0].classroomId") { value(classroom.id.toInt()) } + jsonPath("$[0].title") { value("Class GET1") } } } @Test fun `should get classroom by id`() { val classroom = createClassroom("DETAIL1") - val pupil = userRepository.save(activePupil(username = "detailuser")) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "detail", currentClassroom = classroom)) val token = pupilAccessToken(username = "detailuser", password = "secret123") mockMvc.post("/api/v1/classrooms/join") { @@ -349,6 +353,8 @@ class ClassroomIntegrationTests { val pupil = userRepository.save(activePupil("approveuser")) val teacherToken = teacherPortalAccessToken("owner-APPROVE1@example.com", "secret123") + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "approve", currentClassroom = classroom)) + mockMvc.post("/api/v1/classrooms/join") { with(csrf()) contentType = MediaType.APPLICATION_JSON @@ -370,6 +376,8 @@ class ClassroomIntegrationTests { val pupil = userRepository.save(activePupil("removeuser")) + pupilProfileRepository.save(PupilProfile(user = pupil, displayName = "remove", currentClassroom = classroom)) + mockMvc.post("/api/v1/classrooms/join") { with(csrf()) contentType = MediaType.APPLICATION_JSON @@ -514,6 +522,7 @@ class ClassroomIntegrationTests { role = UserRole.ADMIN, status = UserStatus.ACTIVE, ) + } From e45ff4b69d8e856be152e38657032290de0e5b5b Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Thu, 23 Apr 2026 14:59:35 +0200 Subject: [PATCH 06/10] add teacher to classroom --- .../idatt/backend/bootstrap/DevDataBootstrap.kt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt index f8f01197..e7ad6de8 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt @@ -300,6 +300,7 @@ class DevDataBootstrap( membership.nicknameInClass = nicknameInClass membership.status = ClassroomPupilStatus.ACTIVE membership.approvedAt = membership.approvedAt ?: Instant.now() + classroomRepository.save(classroom) } @@ -309,14 +310,14 @@ class DevDataBootstrap( description: String, joinCode: String, ): Classroom { - classroomRepository.findByJoinCode(joinCode)?.let { existingClassroom -> + val teacherId = requireNotNull(ownerTeacher.id) { "Teacher seed user must have an id" } + val classroom = classroomRepository.findByJoinCode(joinCode)?.let { existingClassroom -> existingClassroom.ownerTeacherId = requireNotNull(ownerTeacher.id) { "Teacher seed user must have an id" } existingClassroom.title = title existingClassroom.description = description existingClassroom.status = ClassroomStatus.ACTIVE return existingClassroom - } - return classroomRepository.save( + } ?: classroomRepository.save( Classroom( ownerTeacherId = requireNotNull(ownerTeacher.id) { "Teacher seed user must have an id" }, title = title, @@ -325,6 +326,16 @@ class DevDataBootstrap( status = ClassroomStatus.ACTIVE, ), ) + + val alreadyMember = classroom.teacherMemberships.any { + it.id.teacherUserId == teacherId + } + + if (!alreadyMember) { + classroom.addTeacher(ownerTeacher) + } + + return classroomRepository.save(classroom) } private fun seedRefreshToken( From b3e3fffacd1d3ef0a589748856abc4eb2854ea3b Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Thu, 23 Apr 2026 15:54:56 +0200 Subject: [PATCH 07/10] fix --- .../ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt index 5a6b9c95..8099e6e9 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt @@ -105,9 +105,9 @@ class DevDataBootstrap( seedClassroomMembership(sampleClassroom, pupilAda, "Ada") seedClassroomMembership(sampleClassroom, pupilNoah, "Noah") seedClassroomMembership(sampleClassroom, pupilSofia, "Sofia") - seedPupilProfile(pupilAda, "Ada", sampleClassroom.id) - seedPupilProfile(pupilNoah, "Noah", sampleClassroom.id) - seedPupilProfile(pupilSofia, "Sofia", sampleClassroom.id) + seedPupilProfile(pupilAda, "Ada", sampleClassroom) + seedPupilProfile(pupilNoah, "Noah", sampleClassroom) + seedPupilProfile(pupilSofia, "Sofia", sampleClassroom) seedPupilAvatar(pupilAda) seedPupilAvatar(pupilNoah) seedPupilAvatar(pupilSofia) From 79a37aeaf983d3391409a48bf7e08c99e5581037 Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Thu, 23 Apr 2026 16:00:55 +0200 Subject: [PATCH 08/10] fix imports --- .../idatt/backend/classroom/application/ClassroomService.kt | 1 - .../ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt index c676ab59..ccd9c566 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt @@ -39,7 +39,6 @@ class ClassroomService( private val classroomUserResolver: ClassroomUserResolver, private val pupilGameProgressRepository: PupilGameProgressRepository, private val taskRepository: TaskRepository, - private val eventPublisher: ApplicationEventPublisher, private val pupilProfileRepository: PupilProfileRepository, private val domainEventPublisher: DomainEventPublisher, ) { diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt index 7f7e8ffd..bf21ac6f 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt @@ -44,7 +44,6 @@ class ClassroomServiceTest { private lateinit var taskRepository: TaskRepository private lateinit var classroomService: ClassroomService private lateinit var userRepository: UserRepository - private lateinit var eventPublisher: ApplicationEventPublisher private lateinit var pupilProfileRepository: PupilProfileRepository private lateinit var eventPublisher: DomainEventPublisher @@ -56,7 +55,6 @@ class ClassroomServiceTest { classroomUserResolver = mock(ClassroomUserResolver::class.java) pupilGameProgressRepository = mock(PupilGameProgressRepository::class.java) taskRepository = mock(TaskRepository::class.java) - eventPublisher = mock(ApplicationEventPublisher::class.java) pupilProfileRepository = mock(PupilProfileRepository::class.java) eventPublisher = mock(DomainEventPublisher::class.java) classroomService = ClassroomService( @@ -66,8 +64,8 @@ class ClassroomServiceTest { classroomUserResolver, pupilGameProgressRepository, taskRepository, - eventPublisher, pupilProfileRepository, + eventPublisher, ) } From 73ae88f2889d97399b7713fc9ab0a86fb106c24a Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Mon, 27 Apr 2026 09:29:43 +0200 Subject: [PATCH 09/10] remove unused import --- .../edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt index bf21ac6f..1308a1fb 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt @@ -33,7 +33,6 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.`when` import org.springframework.http.HttpStatus import org.springframework.web.server.ResponseStatusException -import org.mockito.Mockito.any import java.util.Optional class ClassroomServiceTest { From 775a3097e34f803a9239c3fec77308f4fe9ec635 Mon Sep 17 00:00:00 2001 From: Maria <145002050+marikolafs@users.noreply.github.com> Date: Mon, 27 Apr 2026 09:43:14 +0200 Subject: [PATCH 10/10] merge main into branch --- .../edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt index 510970d0..c6d53f41 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt @@ -114,7 +114,6 @@ class ClassroomServiceTest { assertEquals("PENDING", result.membershipStatus) verify(classroomRepository).save(classroom) - verify(pupilGameProgressRepository).save(any(PupilGameProgress::class.java)) verify(pupilProfileRepository).save(pupilProfile) assertEquals(classroom, pupilProfile.currentClassroom) verify(pupilGameProgressService).createPupilGameProgressEntry(3L, 1L)