diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileApiMappings.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileApiMappings.kt index 3a527645..d6854a51 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileApiMappings.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileApiMappings.kt @@ -19,6 +19,8 @@ fun CurrentUserProfile.toCurrentUserProfileResponse(): CurrentUserProfileRespons PupilProfileResponse( displayName = it.displayName, currentClassroomId = it.currentClassroomId, + totalXp = it.totalXp, + currentLevel = it.currentLevel, ) }, teacherProfile = teacherProfile?.let { @@ -38,6 +40,8 @@ fun PupilProfileDetails.toPupilProfileResponse(): PupilProfileResponse = PupilProfileResponse( displayName = displayName, currentClassroomId = currentClassroomId, + totalXp = totalXp, + currentLevel = currentLevel, ) /** diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileResponse.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileResponse.kt index 3638f3bc..9d4f908c 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileResponse.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/users/profile/api/CurrentUserProfileResponse.kt @@ -26,10 +26,14 @@ data class CurrentUserProfileResponse( * * @property displayName pupil name shown in the product * @property currentClassroomId current classroom id, or `null` when unassigned + * @property totalXp classroom-scoped XP for the active classroom, or `0` when unavailable + * @property currentLevel classroom-scoped level for the active classroom, or `1` when unavailable */ data class PupilProfileResponse( val displayName: String, val currentClassroomId: Long?, + val totalXp: Int, + val currentLevel: Int, ) /** 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..eac625c6 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 @@ -1,5 +1,6 @@ package edu.ntnu.idi.idatt.backend.users.profile.application +import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.users.profile.domain.PupilProfile @@ -15,12 +16,14 @@ import org.springframework.web.server.ResponseStatusException * * @property currentUserResolver resolver to authenticate users * @property pupilProfileRepository repository used to load pupil profile data + * @property pupilGameProgressRepository repository used to load classroom-scoped game progress * @property teacherProfileRepository repository used to load the teacher profile data */ @Service class CurrentUserProfileService( private val currentUserResolver: CurrentUserResolver, private val pupilProfileRepository: PupilProfileRepository, + private val pupilGameProgressRepository: PupilGameProgressRepository, private val teacherProfileRepository: TeacherProfileRepository, ) { /** @@ -37,9 +40,13 @@ class CurrentUserProfileService( val pupilProfile = if (user.role == UserRole.PUPIL) { pupilProfileRepository.findById(userId) .map { + val progress = getCurrentClassroomProgress(userId, it.currentClassroomId) + PupilProfileDetails( displayName = it.displayName, currentClassroomId = it.currentClassroomId, + totalXp = progress?.totalXp ?: 0, + currentLevel = progress?.currentLevel ?: 1, ) } .orElseThrow { @@ -89,12 +96,15 @@ 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) pupilProfile.displayName = command.displayName.trim() val savedProfile = pupilProfileRepository.save(pupilProfile) return PupilProfileDetails( displayName = savedProfile.displayName, currentClassroomId = savedProfile.currentClassroomId, + totalXp = progress?.totalXp ?: 0, + currentLevel = progress?.currentLevel ?: 1, ) } @@ -109,6 +119,9 @@ class CurrentUserProfileService( .orElseThrow { ResponseStatusException(HttpStatus.NOT_FOUND, "Pupil profile was not found") } + + private fun getCurrentClassroomProgress(userId: Long, classroomId: Long?) = + classroomId?.let { pupilGameProgressRepository.findByPupilIdAndClassroomId(userId, it) } } /** @@ -136,6 +149,8 @@ data class CurrentUserProfile( data class PupilProfileDetails( val displayName: String, val currentClassroomId: Long?, + val totalXp: Int, + val currentLevel: Int, ) /** 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..0be7d098 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,7 @@ package edu.ntnu.idi.idatt.backend.users.profile +import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgress +import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository 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 @@ -23,10 +25,12 @@ class CurrentUserProfileServiceTests { fun `get current user profile returns pupil profile for pupil user`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val user = pupilUser(42L) @@ -40,6 +44,9 @@ class CurrentUserProfileServiceTests { Mockito.`when`(currentUserResolver.requireUser("42")).thenReturn(user) Mockito.`when`(pupilProfileRepository.findById(42L)).thenReturn(Optional.of(pupilProfile)) + Mockito.`when`(pupilGameProgressRepository.findByPupilIdAndClassroomId(42L, 101L)).thenReturn( + PupilGameProgress(totalXp = 480, currentLevel = 4), + ) val resolvedProfile = service.getCurrentUserProfile("42") @@ -49,17 +56,83 @@ class CurrentUserProfileServiceTests { assertNull(resolvedProfile.email) assertEquals("Ada", resolvedProfile.pupilProfile?.displayName) assertEquals(101L, resolvedProfile.pupilProfile?.currentClassroomId) + assertEquals(480, resolvedProfile.pupilProfile?.totalXp) + assertEquals(4, resolvedProfile.pupilProfile?.currentLevel) assertNull(resolvedProfile.teacherProfile) } + @Test + fun `get current user profile returns default progress when pupil has no current classroom`() { + val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) + val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) + val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) + val service = CurrentUserProfileService( + currentUserResolver, + pupilProfileRepository, + pupilGameProgressRepository, + teacherProfileRepository, + ) + val user = pupilUser(42L) + val pupilProfile = PupilProfile( + user = user, + displayName = "Ada", + currentClassroomId = null, + ).apply { + userId = 42L + } + + Mockito.`when`(currentUserResolver.requireUser("42")).thenReturn(user) + Mockito.`when`(pupilProfileRepository.findById(42L)).thenReturn(Optional.of(pupilProfile)) + + val resolvedProfile = service.getCurrentUserProfile("42") + + assertEquals(0, resolvedProfile.pupilProfile?.totalXp) + assertEquals(1, resolvedProfile.pupilProfile?.currentLevel) + Mockito.verifyNoInteractions(pupilGameProgressRepository) + } + + @Test + fun `get current user profile returns default progress when classroom progress row is missing`() { + val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) + val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) + val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) + val service = CurrentUserProfileService( + currentUserResolver, + pupilProfileRepository, + pupilGameProgressRepository, + teacherProfileRepository, + ) + val user = pupilUser(42L) + val pupilProfile = PupilProfile( + user = user, + displayName = "Ada", + currentClassroomId = 101L, + ).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) + + val resolvedProfile = service.getCurrentUserProfile("42") + + assertEquals(0, resolvedProfile.pupilProfile?.totalXp) + assertEquals(1, resolvedProfile.pupilProfile?.currentLevel) + } + @Test fun `get current user profile returns teacher shell for teacher user`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val user = teacherUser(7L) @@ -89,10 +162,12 @@ class CurrentUserProfileServiceTests { fun `get current user profile rejects invalid authenticated subject`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val exception = ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid authenticated user subject") @@ -110,10 +185,12 @@ class CurrentUserProfileServiceTests { fun `get current user profile rejects unknown authenticated user`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val exception = ResponseStatusException(HttpStatus.UNAUTHORIZED, "Authenticated user was not found") @@ -131,10 +208,12 @@ class CurrentUserProfileServiceTests { fun `get current user profile rejects pupil without profile row`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val user = pupilUser(42L) @@ -153,10 +232,12 @@ class CurrentUserProfileServiceTests { fun `get current user profile rejects teacher without profile row`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val user = teacherUser(7L) @@ -175,10 +256,12 @@ class CurrentUserProfileServiceTests { fun `update current user display name persists submitted value for pupil`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val user = pupilUser(42L) @@ -195,6 +278,9 @@ class CurrentUserProfileServiceTests { Mockito.`when`(pupilProfileRepository.save(Mockito.any(PupilProfile::class.java))).thenAnswer { invocation -> invocation.arguments[0] as PupilProfile } + Mockito.`when`(pupilGameProgressRepository.findByPupilIdAndClassroomId(42L, 101L)).thenReturn( + PupilGameProgress(totalXp = 480, currentLevel = 4), + ) val updatedProfile = service.updateCurrentUserDisplayName( "42", @@ -202,6 +288,9 @@ class CurrentUserProfileServiceTests { ) assertEquals("Ada Lovelace", updatedProfile.displayName) + assertEquals(101L, updatedProfile.currentClassroomId) + assertEquals(480, updatedProfile.totalXp) + assertEquals(4, updatedProfile.currentLevel) assertEquals("Ada Lovelace", pupilProfile.displayName) } @@ -209,10 +298,12 @@ class CurrentUserProfileServiceTests { fun `update current user display name rejects teacher user`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val exception = ResponseStatusException(HttpStatus.FORBIDDEN, "Only pupils are allowed") @@ -233,10 +324,12 @@ class CurrentUserProfileServiceTests { fun `update current user display name rejects pupil without profile row`() { val currentUserResolver = Mockito.mock(CurrentUserResolver::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) + val pupilGameProgressRepository = Mockito.mock(PupilGameProgressRepository::class.java) val teacherProfileRepository = Mockito.mock(TeacherProfileRepository::class.java) val service = CurrentUserProfileService( currentUserResolver, pupilProfileRepository, + pupilGameProgressRepository, teacherProfileRepository, ) val user = pupilUser(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..9532f630 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 @@ -2,6 +2,9 @@ package edu.ntnu.idi.idatt.backend.users.profile import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.json.JsonMapper +import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgress +import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgressId +import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository 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 @@ -44,6 +47,9 @@ class UserProfileControllerIntegrationTests { @Autowired private lateinit var pupilProfileRepository: PupilProfileRepository + @Autowired + private lateinit var pupilGameProgressRepository: PupilGameProgressRepository + @Autowired private lateinit var teacherProfileRepository: TeacherProfileRepository @@ -58,6 +64,7 @@ class UserProfileControllerIntegrationTests { @BeforeEach fun setUp() { refreshTokenRepository.deleteAll() + pupilGameProgressRepository.deleteAll() pupilProfileRepository.deleteAll() classroomRepository.deleteAll() teacherProfileRepository.deleteAll() @@ -78,6 +85,15 @@ class UserProfileControllerIntegrationTests { currentClassroomId = classroom.id, ), ) + pupilGameProgressRepository.save( + PupilGameProgress( + id = PupilGameProgressId(requireNotNull(pupil.id), requireNotNull(classroom.id)), + pupil = pupil, + classroom = classroom, + totalXp = 480, + currentLevel = 4, + ), + ) val accessToken = pupilAccessToken("ada", "secret123") @@ -95,9 +111,40 @@ class UserProfileControllerIntegrationTests { assertEquals("ada", body.get("username").asText()) assertEquals("Ada", body.get("pupilProfile").get("displayName").asText()) assertEquals(classroom.id, body.get("pupilProfile").get("currentClassroomId").asLong()) + assertEquals(480, body.get("pupilProfile").get("totalXp").asInt()) + assertEquals(4, body.get("pupilProfile").get("currentLevel").asInt()) assertTrue(body.get("teacherProfile").isNull) } + @Test + fun `authenticated pupil get returns default progress when current classroom has no progress row`() { + val pupil = userRepository.save(activePupil()) + val teacher = userRepository.save(activeTeacher()) + val classroom = classroomRepository.save( + Classroom(ownerTeacherId = requireNotNull(teacher.id), title = "Test Class") + ) + pupilProfileRepository.save( + PupilProfile( + user = pupil, + displayName = "Ada", + currentClassroomId = classroom.id, + ), + ) + + val accessToken = pupilAccessToken("ada", "secret123") + + val body = readJson( + mockMvc.get("/api/v1/users/me") { + header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") + }.andExpect { + status { isOk() } + }.andReturn().response.contentAsString, + ) + + assertEquals(0, body.get("pupilProfile").get("totalXp").asInt()) + assertEquals(1, body.get("pupilProfile").get("currentLevel").asInt()) + } + @Test fun `authenticated teacher get returns current teacher shell`() { val teacher = userRepository.save(activeTeacher()) @@ -148,6 +195,15 @@ class UserProfileControllerIntegrationTests { currentClassroomId = classroom.id, ), ) + pupilGameProgressRepository.save( + PupilGameProgress( + id = PupilGameProgressId(requireNotNull(pupil.id), requireNotNull(classroom.id)), + pupil = pupil, + classroom = classroom, + totalXp = 480, + currentLevel = 4, + ), + ) val accessToken = pupilAccessToken("ada", "secret123") @@ -161,10 +217,14 @@ class UserProfileControllerIntegrationTests { status { isOk() } jsonPath("$.displayName") { value("Ada Lovelace") } jsonPath("$.currentClassroomId") { value(classroom.id) } + jsonPath("$.totalXp") { value(480) } + jsonPath("$.currentLevel") { value(4) } }.andReturn().response.contentAsString, ) assertEquals("Ada Lovelace", body.get("displayName").asText()) + assertEquals(480, body.get("totalXp").asInt()) + assertEquals(4, body.get("currentLevel").asInt()) assertEquals("Ada Lovelace", pupilProfileRepository.findById(requireNotNull(pupil.id)).get().displayName) }