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..16e8fe0c 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 @@ -541,21 +541,33 @@ class DevDataBootstrap( SeedItem( itemOrder = 1, promptText = localized( - "HELT UTROLIG! Forskning beviser at sjokolade er sunt!\n\nEn ny, banebrekkende studie har ENDELIG bevist det vi alle har håpet på: sjokolade er like sunt som – eller kanskje til og med sunnere enn – grønnsaker! Legen som ledet forskningen ble selv overrasket over resultatene.\n\n\"Vi kan ikke tro det vi ser. Sjokolade kurerer nesten alt,\" skal en navnløs forsker ha sagt.\n\nEksperter fra hele verden er nå i sjokk. Det anbefales å spise minst 200 gram sjokolade daglig for å holde seg frisk. Grønnsaker kan trygt droppes!\nDel denne artikkelen med alle du kjenner FØR myndighetene sensurerer den – Big Pharma vil ikke at du skal vite dette!", - "UNBELIEVABLE! Research proves chocolate is healthy!\n\nA groundbreaking new study has FINALLY proven what we all hoped: chocolate is just as healthy as - or perhaps even healthier than - vegetables! The doctor who led the research was surprised by the results.\n\n\"We cannot believe what we are seeing. Chocolate cures almost everything,\" an anonymous researcher allegedly said.\n\nExperts worldwide are now in shock. It is recommended to eat at least 200 grams of chocolate daily to stay healthy. Vegetables can safely be dropped!\nShare this article with everyone you know BEFORE the authorities censor it - Big Pharma does not want you to know this!", + "Hvilken artikkel virker mest troverdig?", + "Which article appears most trustworthy?", ), - metadataJson = """{"domain":"helserevolusjonen.no"}""", - options = emptyList(), - ), - SeedItem( - itemOrder = 2, - promptText = localized( - "Studie: Mørk sjokolade kan ha helsegevinster\n\nEn ny studie publisert i tidsskriftet Nutrients viser at flavonoider i mørk sjokolade (70 % kakao eller mer) kan bidra til lavere blodtrykk og bedre insulinfølsomhet hos noen voksne.\n\n\"Effekten er reell, men begrenset. Dette er ikke en erstatning for et sunt kosthold med grønnsaker, frukt og fiber,\" sier ernæringsforsker Tone Berg ved UiO.\n\nStudien fulgte 200 deltakere over 12 uker og målte blodtrykk og betennelsesmarkører. Forskerne understreker at porsjonsstørrelse er avgjørende – rundt 20–30 gram per dag var mengden brukt i forsøket. Helsedirektoratet minner om at sjokolade fortsatt er kaloririk og ikke inngår i de generelle kostrådene.", - "Study: Dark chocolate may have health benefits\n\nA new study published in the journal Nutrients shows that flavonoids in dark chocolate (70% cocoa or more) may contribute to lower blood pressure and better insulin sensitivity in some adults.\n\n\"The effect is real but limited. This is not a replacement for a healthy diet with vegetables, fruit, and fibre,\" says nutritional researcher Tone Berg at UiO.\n\nThe study followed 200 participants over 12 weeks and measured blood pressure and inflammation markers. Researchers emphasise that portion size is decisive - around 20-30 grams per day was the amount used in the trial. The Directorate of Health notes that chocolate remains calorie-dense and is not part of general dietary guidelines.", + metadataJson = """ + {"articles":[ + {"optionOrder":1,"domain":"helserevolusjonen.no","headline":{"nb":"HELT UTROLIG! Forskning beviser at sjokolade er sunt!","en":"UNBELIEVABLE! Research proves chocolate is healthy!"},"body":{"nb":"En ny, banebrekkende studie har ENDELIG bevist det vi alle har håpet på: sjokolade er like sunt som – eller kanskje til og med sunnere enn – grønnsaker! Legen som ledet forskningen ble selv overrasket over resultatene.\n\n\"Vi kan ikke tro det vi ser. Sjokolade kurerer nesten alt,\" skal en navnløs forsker ha sagt.\n\nEksperter fra hele verden er nå i sjokk. Det anbefales å spise minst 200 gram sjokolade daglig for å holde seg frisk. Grønnsaker kan trygt droppes!\nDel denne artikkelen med alle du kjenner FØR myndighetene sensurerer den – Big Pharma vil ikke at du skal vite dette!","en":"A groundbreaking new study has FINALLY proven what we all hoped: chocolate is just as healthy as - or perhaps even healthier than - vegetables! The doctor who led the research was surprised by the results.\n\n\"We cannot believe what we are seeing. Chocolate cures almost everything,\" an anonymous researcher allegedly said.\n\nExperts worldwide are now in shock. It is recommended to eat at least 200 grams of chocolate daily to stay healthy. Vegetables can safely be dropped!\nShare this article with everyone you know BEFORE the authorities censor it - Big Pharma does not want you to know this!"},"mediaUrl":null}, + {"optionOrder":2,"domain":"forskning.no","headline":{"nb":"Studie: Mørk sjokolade kan ha helsegevinster","en":"Study: Dark chocolate may have health benefits"},"body":{"nb":"En ny studie publisert i tidsskriftet Nutrients viser at flavonoider i mørk sjokolade (70 % kakao eller mer) kan bidra til lavere blodtrykk og bedre insulinfølsomhet hos noen voksne.\n\n\"Effekten er reell, men begrenset. Dette er ikke en erstatning for et sunt kosthold med grønnsaker, frukt og fiber,\" sier ernæringsforsker Tone Berg ved UiO.\n\nStudien fulgte 200 deltakere over 12 uker og målte blodtrykk og betennelsesmarkører. Forskerne understreker at porsjonsstørrelse er avgjørende – rundt 20–30 gram per dag var mengden brukt i forsøket. Helsedirektoratet minner om at sjokolade fortsatt er kaloririk og ikke inngår i de generelle kostrådene.","en":"A new study published in the journal Nutrients shows that flavonoids in dark chocolate (70% cocoa or more) may contribute to lower blood pressure and better insulin sensitivity in some adults.\n\n\"The effect is real but limited. This is not a replacement for a healthy diet with vegetables, fruit, and fibre,\" says nutritional researcher Tone Berg at UiO.\n\nThe study followed 200 participants over 12 weeks and measured blood pressure and inflammation markers. Researchers emphasise that portion size is decisive - around 20-30 grams per day was the amount used in the trial. The Directorate of Health notes that chocolate remains calorie-dense and is not part of general dietary guidelines."},"mediaUrl":"https://images.unsplash.com/photo-1481391319762-47dff72954d9?w=600&q=80"} + ]} + """.trimIndent(), + options = listOf( + explainedOption( + 1, + "HELT UTROLIG! Forskning beviser at sjokolade er sunt!\n\nEn ny, banebrekkende studie har ENDELIG bevist det vi alle har håpet på: sjokolade er like sunt som – eller kanskje til og med sunnere enn – grønnsaker! Legen som ledet forskningen ble selv overrasket over resultatene.\n\n\"Vi kan ikke tro det vi ser. Sjokolade kurerer nesten alt,\" skal en navnløs forsker ha sagt.\n\nEksperter fra hele verden er nå i sjokk. Det anbefales å spise minst 200 gram sjokolade daglig for å holde seg frisk. Grønnsaker kan trygt droppes!\nDel denne artikkelen med alle du kjenner FØR myndighetene sensurerer den – Big Pharma vil ikke at du skal vite dette!", + "UNBELIEVABLE! Research proves chocolate is healthy!\n\nA groundbreaking new study has FINALLY proven what we all hoped: chocolate is just as healthy as - or perhaps even healthier than - vegetables! The doctor who led the research was surprised by the results.\n\n\"We cannot believe what we are seeing. Chocolate cures almost everything,\" an anonymous researcher allegedly said.\n\nExperts worldwide are now in shock. It is recommended to eat at least 200 grams of chocolate daily to stay healthy. Vegetables can safely be dropped!\nShare this article with everyone you know BEFORE the authorities censor it - Big Pharma does not want you to know this!", + false, + "Denne saken bruker sensasjonelt språk, anonyme kilder og overdrevne påstander uten troverdige bevis.", + "This story uses sensational language, anonymous sources, and exaggerated claims without credible evidence.", + ), + explainedOption( + 2, + "Studie: Mørk sjokolade kan ha helsegevinster\n\nEn ny studie publisert i tidsskriftet Nutrients viser at flavonoider i mørk sjokolade (70 % kakao eller mer) kan bidra til lavere blodtrykk og bedre insulinfølsomhet hos noen voksne.\n\n\"Effekten er reell, men begrenset. Dette er ikke en erstatning for et sunt kosthold med grønnsaker, frukt og fiber,\" sier ernæringsforsker Tone Berg ved UiO.\n\nStudien fulgte 200 deltakere over 12 uker og målte blodtrykk og betennelsesmarkører. Forskerne understreker at porsjonsstørrelse er avgjørende – rundt 20–30 gram per dag var mengden brukt i forsøket. Helsedirektoratet minner om at sjokolade fortsatt er kaloririk og ikke inngår i de generelle kostrådene.", + "Study: Dark chocolate may have health benefits\n\nA new study published in the journal Nutrients shows that flavonoids in dark chocolate (70% cocoa or more) may contribute to lower blood pressure and better insulin sensitivity in some adults.\n\n\"The effect is real but limited. This is not a replacement for a healthy diet with vegetables, fruit, and fibre,\" says nutritional researcher Tone Berg at UiO.\n\nThe study followed 200 participants over 12 weeks and measured blood pressure and inflammation markers. Researchers emphasise that portion size is decisive - around 20-30 grams per day was the amount used in the trial. The Directorate of Health notes that chocolate remains calorie-dense and is not part of general dietary guidelines.", + true, + "Denne saken viser til en konkret studie, oppgir kilde og forklarer begrensningene i funnene.", + "This story cites a concrete study, names the source, and explains the limits of the findings.", + ), ), - mediaUrl = "https://images.unsplash.com/photo-1481391319762-47dff72954d9?w=600&q=80", - metadataJson = """{"domain":"forskning.no"}""", - options = emptyList(), ), ), ), @@ -571,20 +583,33 @@ class DevDataBootstrap( SeedItem( itemOrder = 1, promptText = localized( - "LEGEN HAR IKKE FORTALT DEG DETTE! Én enkel ting kurerer alle sykdommer\n\nLegemiddelindustrien skjuler en hemmelighet som kan endre livet ditt. En ukjent doktor avslørte nylig at du ALDRI trenger å bli syk igjen. Klikk her for å finne ut hva Big Pharma ikke vil du skal vite.", - "YOUR DOCTOR NEVER TOLD YOU THIS! One simple thing cures all diseases\n\nThe pharmaceutical industry is hiding a secret that could change your life. An unknown doctor recently revealed you NEVER have to get sick again. Click here to find out what Big Pharma does not want you to know.", + "Hvilken artikkel bruker mest seriøst og nøytralt språk?", + "Which article uses the most serious and neutral language?", ), - metadataJson = """{"domain":"helseavsloringer.net"}""", - options = emptyList(), - ), - SeedItem( - itemOrder = 2, - promptText = localized( - "Ny rapport: Regelmessig mosjon reduserer risiko for hjerte- og karsykdommer\n\nFolkehelseinstituttet presenterte i dag en ny rapport som viser at 150 minutter moderat fysisk aktivitet per uke er forbundet med 35 prosent lavere risiko for hjerteinfarkt hos voksne over 40 år. Rapporten bygger på data fra over 50 000 nordmenn fulgt over ti år.", - "New report: Regular exercise reduces risk of cardiovascular disease\n\nThe Norwegian Institute of Public Health today presented a new report showing that 150 minutes of moderate physical activity per week is associated with a 35 percent lower risk of heart attack in adults over 40. The report is based on data from over 50,000 Norwegians followed over ten years.", + metadataJson = """ + {"articles":[ + {"optionOrder":1,"domain":"helseavsloringer.net","headline":{"nb":"LEGEN HAR IKKE FORTALT DEG DETTE! Én enkel ting kurerer alle sykdommer","en":"YOUR DOCTOR NEVER TOLD YOU THIS! One simple thing cures all diseases"},"body":{"nb":"Legemiddelindustrien skjuler en hemmelighet som kan endre livet ditt. En ukjent doktor avslørte nylig at du ALDRI trenger å bli syk igjen. Klikk her for å finne ut hva Big Pharma ikke vil du skal vite.","en":"The pharmaceutical industry is hiding a secret that could change your life. An unknown doctor recently revealed you NEVER have to get sick again. Click here to find out what Big Pharma does not want you to know."},"mediaUrl":null}, + {"optionOrder":2,"domain":"fhi.no","headline":{"nb":"Ny rapport: Regelmessig mosjon reduserer risiko for hjerte- og karsykdommer","en":"New report: Regular exercise reduces risk of cardiovascular disease"},"body":{"nb":"Folkehelseinstituttet presenterte i dag en ny rapport som viser at 150 minutter moderat fysisk aktivitet per uke er forbundet med 35 prosent lavere risiko for hjerteinfarkt hos voksne over 40 år. Rapporten bygger på data fra over 50 000 nordmenn fulgt over ti år.","en":"The Norwegian Institute of Public Health today presented a new report showing that 150 minutes of moderate physical activity per week is associated with a 35 percent lower risk of heart attack in adults over 40. The report is based on data from over 50,000 Norwegians followed over ten years."},"mediaUrl":null} + ]} + """.trimIndent(), + options = listOf( + explainedOption( + 1, + "LEGEN HAR IKKE FORTALT DEG DETTE! Én enkel ting kurerer alle sykdommer\n\nLegemiddelindustrien skjuler en hemmelighet som kan endre livet ditt. En ukjent doktor avslørte nylig at du ALDRI trenger å bli syk igjen. Klikk her for å finne ut hva Big Pharma ikke vil du skal vite.", + "YOUR DOCTOR NEVER TOLD YOU THIS! One simple thing cures all diseases\n\nThe pharmaceutical industry is hiding a secret that could change your life. An unknown doctor recently revealed you NEVER have to get sick again. Click here to find out what Big Pharma does not want you to know.", + false, + "Denne saken bruker clickbait, sterke følelsesord og udokumenterte påstander for å lokke deg til å klikke.", + "This story uses clickbait, emotional language, and unsupported claims to make you click.", + ), + explainedOption( + 2, + "Ny rapport: Regelmessig mosjon reduserer risiko for hjerte- og karsykdommer\n\nFolkehelseinstituttet presenterte i dag en ny rapport som viser at 150 minutter moderat fysisk aktivitet per uke er forbundet med 35 prosent lavere risiko for hjerteinfarkt hos voksne over 40 år. Rapporten bygger på data fra over 50 000 nordmenn fulgt over ti år.", + "New report: Regular exercise reduces risk of cardiovascular disease\n\nThe Norwegian Institute of Public Health today presented a new report showing that 150 minutes of moderate physical activity per week is associated with a 35 percent lower risk of heart attack in adults over 40. The report is based on data from over 50,000 Norwegians followed over ten years.", + true, + "Denne saken bruker nøkternt språk, oppgir avsender og beskriver datagrunnlaget på en etterprøvbar måte.", + "This story uses neutral language, names the source, and describes the evidence in a verifiable way.", + ), ), - metadataJson = """{"domain":"fhi.no"}""", - options = emptyList(), ), ), ), @@ -600,20 +625,33 @@ class DevDataBootstrap( SeedItem( itemOrder = 1, promptText = localized( - "Tre klasser testet lesetidene sine i to uker og skrev ned resultatene.", - "Three classes tested their reading times for two weeks and wrote down the results.", + "Hvilken tekst bruker mest fakta og minst følelsespress?", + "Which text uses the most facts and the least emotional pressure?", ), - metadataJson = null, - options = emptyList(), - ), - SeedItem( - itemOrder = 2, - promptText = localized( - "Alle er rasende etter den utrolig skumle nyheten som sprer seg overalt.", - "Everyone is furious after the incredibly scary news spreading everywhere.", + metadataJson = """ + {"articles":[ + {"optionOrder":1,"domain":null,"headline":{"nb":"Tre klasser testet lesetidene sine i to uker","en":"Three classes tested their reading times for two weeks"},"body":{"nb":"og skrev ned resultatene.","en":"and wrote down the results."},"mediaUrl":null}, + {"optionOrder":2,"domain":null,"headline":{"nb":"Alle er rasende etter den utrolig skumle nyheten","en":"Everyone is furious after the incredibly scary news"},"body":{"nb":"som sprer seg overalt.","en":"spreading everywhere."},"mediaUrl":null} + ]} + """.trimIndent(), + options = listOf( + explainedOption( + 1, + "Tre klasser testet lesetidene sine i to uker og skrev ned resultatene.", + "Three classes tested their reading times for two weeks and wrote down the results.", + true, + "Denne teksten beskriver observerbare fakta uten å presse fram en følelsesmessig reaksjon.", + "This text describes observable facts without trying to force an emotional reaction.", + ), + explainedOption( + 2, + "Alle er rasende etter den utrolig skumle nyheten som sprer seg overalt.", + "Everyone is furious after the incredibly scary news spreading everywhere.", + false, + "Denne teksten bruker følelsesladde ord som 'rasende' og 'skumle' i stedet for konkrete fakta.", + "This text uses emotional words like 'furious' and 'scary' instead of concrete facts.", + ), ), - metadataJson = null, - options = emptyList(), ), ), ), diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt index bf78a2fa..c996cdf0 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt @@ -7,6 +7,7 @@ import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgressRepository +import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import org.springframework.http.HttpStatus import org.springframework.stereotype.Service @@ -23,6 +24,7 @@ class MapStopService( private val mapStopsRepository: MapStopsRepository, private val pupilStopProgressRepository: PupilStopProgressRepository, private val gameAccessContextResolver: GameAccessContextResolver, + private val taskRepository: TaskRepository, ) { /** * Returns all active map stops sorted by display order. @@ -66,10 +68,12 @@ class MapStopService( val progressByStopId = pupilStopProgressRepository .findAllByIdPupilUserIdAndIdClassroomId(accessContext.pupilUserId, classroomId) .associateBy { it.id.stopId } + val maxScoreByStopId = loadPublishedStopMaxScores(classroomId) return stops.mapNotNull { stop -> val stopId = stop.id ?: return@mapNotNull null val progress = progressByStopId[stop.id!!] + val maxScore = maxScoreByStopId[stopId] ?: 0 MapStopOverviewEntry( stopId = stopId, slug = stop.slug, @@ -78,7 +82,7 @@ class MapStopService( displayOrder = stop.displayOrder ?: 0, isFinalBoss = stop.isFinalBoss ?: false, status = progress?.status ?: StopProgressStatus.LOCKED, - stars = progress?.let { computeStars(it.bestScore, stop.maxScore ?: 0) } ?: 0, + stars = progress?.let { computeStars(it.bestScore, maxScore) } ?: 0, medalAwarded = progress?.medalAwarded ?: false, ) } @@ -106,6 +110,7 @@ class MapStopService( } val stopId = stop.id ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Map stop has no id") + val maxScoreByStopId = loadPublishedStopMaxScores(classroomId) val progress = pupilStopProgressRepository .findByIdPupilUserIdAndIdClassroomIdAndIdStopId(accessContext.pupilUserId, classroomId, stopId) @@ -118,11 +123,21 @@ class MapStopService( displayOrder = stop.displayOrder ?: 0, isFinalBoss = stop.isFinalBoss ?: false, status = progress?.status ?: StopProgressStatus.LOCKED, - stars = progress?.let { computeStars(it.bestScore, stop.maxScore ?: 0) } ?: 0, + stars = progress?.let { computeStars(it.bestScore, maxScoreByStopId[stopId] ?: 0) } ?: 0, medalAwarded = progress?.medalAwarded ?: false, ) } + /** + * Loads the total max score for all published tasks at each stop in a classroom. + */ + private fun loadPublishedStopMaxScores(classroomId: Long): Map = + taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(classroomId) + .asSequence() + .filter { it.isPublished } + .groupBy { it.stopId } + .mapValues { (_, tasks) -> tasks.sumOf { it.maxScore } } + private fun computeStars(bestScore: Int, maxScore: Int): Int { if (maxScore == 0) return 0 val ratio = bestScore.toDouble() / maxScore diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilStopProgressService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilStopProgressService.kt index 5c844634..61fde0ac 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilStopProgressService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilStopProgressService.kt @@ -87,6 +87,7 @@ class PupilStopProgressService( progress.status = next if (next == StopProgressStatus.COMPLETED && progress.completedAt == null) { + progress.currentTaskId = null progress.completedAt = Instant.now() unlockNextStop(pupilUserId, classroomId, stopId, activeStops) } @@ -183,4 +184,4 @@ class PupilStopProgressService( ) } } -} \ No newline at end of file +} diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskApiMappings.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskApiMappings.kt index 2f019e01..fb077525 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskApiMappings.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskApiMappings.kt @@ -2,7 +2,9 @@ package edu.ntnu.idi.idatt.backend.game.tasks.api import edu.ntnu.idi.idatt.backend.game.tasks.application.LocalizedOptionalText import edu.ntnu.idi.idatt.backend.game.tasks.application.LocalizedText +import edu.ntnu.idi.idatt.backend.game.tasks.application.StopSubmissionResult import edu.ntnu.idi.idatt.backend.game.tasks.application.TaskDetails +import edu.ntnu.idi.idatt.backend.game.tasks.application.TaskSubmissionResult import edu.ntnu.idi.idatt.backend.game.tasks.application.TaskSummary /** @@ -68,3 +70,30 @@ private fun LocalizedText.toResponse(): LocalizedTextResponse = private fun LocalizedOptionalText.toResponse(): LocalizedOptionalTextResponse = LocalizedOptionalTextResponse(nb = nb, en = en) + +/** + * Maps the stop submission result to the API response. + */ +fun StopSubmissionResult.toResponse(): StopSubmissionResponse = + StopSubmissionResponse( + stopId = stopId, + passed = passed, + score = score, + maxScore = maxScore, + stopStatus = stopStatus, + completedAt = completedAt, + taskResults = taskResults.map { it.toResponse() }, + ) + +/** + * Maps a single task submission result to the API response. + */ +private fun TaskSubmissionResult.toResponse(): TaskSubmissionResultResponse = + TaskSubmissionResultResponse( + taskId = taskId, + title = title.toResponse(), + passed = passed, + score = score, + maxScore = maxScore, + feedbackText = feedbackText?.toResponse(), + ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt index b1a2d731..9be6c621 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt @@ -51,6 +51,17 @@ class TaskController( .getTask(currentUser, classroomId, taskId) .let { it.task.toResponse(includeAnswers = it.includeAnswers) } + /** + * Submits answers for all published tasks at a stop. + */ + @PostMapping("/submit-stop") + fun submitStopAnswers( + @PathVariable classroomId: Long, + @RequestBody @Valid request: SubmitStopAnswersRequest, + @AuthenticationPrincipal currentUser: CurrentUser, + ): StopSubmissionResponse = + taskService.submitStopAnswers(request.toCommand(classroomId, currentUser.subject)).toResponse() + /** * Creates a new draft task owned by the classroom's teacher. */ diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt index d1edf577..3479fcce 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt @@ -61,6 +61,36 @@ data class TaskItemRequest( val options: List = emptyList(), ) +/** + * Request payload for submitting answers for all tasks at a stop. + */ +data class SubmitStopAnswersRequest( + @field:Min(1) + val stopId: Long, + @field:Valid + val taskAnswers: List = emptyList(), +) + +/** + * Request payload for answers to a specific task. + */ +data class SubmitTaskAnswerRequest( + @field:Min(1) + val taskId: Long, + @field:Valid + val itemAnswers: List = emptyList(), +) + +/** + * Request payload for the selected option of a specific task item. + */ +data class SubmitItemAnswerRequest( + @field:Min(1) + val itemId: Long, + @field:Min(1) + val selectedOptionId: Long, +) + /** * Request payload for creating a new task inside one classroom. */ @@ -185,3 +215,23 @@ private fun LocalizedRequiredTextRequest.toLocalizedText(): LocalizedText = private fun LocalizedOptionalTextRequest.toLocalizedOptionalText(): LocalizedOptionalText = LocalizedOptionalText(nb = nb, en = en) + +fun SubmitStopAnswersRequest.toCommand( + classroomId: Long, + authenticatedSubject: String, +) = edu.ntnu.idi.idatt.backend.game.tasks.application.SubmitStopAnswersCommand( + authenticatedSubject = authenticatedSubject, + classroomId = classroomId, + stopId = stopId, + taskAnswers = taskAnswers.map { taskAnswer -> + edu.ntnu.idi.idatt.backend.game.tasks.application.SubmitTaskAnswerCommand( + taskId = taskAnswer.taskId, + itemAnswers = taskAnswer.itemAnswers.map { itemAnswer -> + edu.ntnu.idi.idatt.backend.game.tasks.application.SubmitItemAnswerCommand( + itemId = itemAnswer.itemId, + selectedOptionId = itemAnswer.selectedOptionId, + ) + }, + ) + }, +) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskResponses.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskResponses.kt index c2e14a64..aafd8f00 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskResponses.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskResponses.kt @@ -36,6 +36,7 @@ data class TaskOptionResponse( /** * Serialized prompt item returned from task endpoints. */ +@JsonInclude(JsonInclude.Include.NON_NULL) data class TaskItemResponse( val id: Long, val itemOrder: Int, @@ -80,3 +81,28 @@ data class TaskSummaryResponse( val itemCount: Int, val updatedAt: Instant?, ) + +/** + * Response shape for the result of a single task submission. + */ +data class TaskSubmissionResultResponse( + val taskId: Long, + val title: LocalizedTextResponse, + val passed: Boolean, + val score: Int, + val maxScore: Int, + val feedbackText: LocalizedOptionalTextResponse?, +) + +/** + * Response shape for the result of a stop submission. + */ +data class StopSubmissionResponse( + val stopId: Long, + val passed: Boolean, + val score: Int, + val maxScore: Int, + val stopStatus: String, + val completedAt: Instant?, + val taskResults: List, +) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt index 37d0bd58..f4909c43 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt @@ -142,3 +142,54 @@ data class TaskSummary( val itemCount: Int, val updatedAt: Instant?, ) + +/** + * Command used to submit answers for all tasks at a given stop. + */ +data class SubmitStopAnswersCommand( + val authenticatedSubject: String, + val classroomId: Long, + val stopId: Long, + val taskAnswers: List, +) + +/** + * Command containing answers for a specific task. + */ +data class SubmitTaskAnswerCommand( + val taskId: Long, + val itemAnswers: List, +) + +/** + * Command containing the selected option for a specific task item. + */ +data class SubmitItemAnswerCommand( + val itemId: Long, + val selectedOptionId: Long, +) + +/** + * The result of a stop submission, including overall score and individual task results. + */ +data class StopSubmissionResult( + val stopId: Long, + val passed: Boolean, + val score: Int, + val maxScore: Int, + val stopStatus: String, + val completedAt: Instant?, + val taskResults: List, +) + +/** + * The result of a single task submission. + */ +data class TaskSubmissionResult( + val taskId: Long, + val title: LocalizedText, + val passed: Boolean, + val score: Int, + val maxScore: Int, + val feedbackText: LocalizedOptionalText?, +) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt index ea8fd76a..d0afbd8b 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt @@ -2,10 +2,11 @@ package edu.ntnu.idi.idatt.backend.game.tasks.application import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository +import edu.ntnu.idi.idatt.backend.game.mapstops.application.PupilStopProgressService +import edu.ntnu.idi.idatt.backend.game.mapstops.application.UpdateStopProgressCommand +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus import edu.ntnu.idi.idatt.backend.game.application.GameAccessContextResolver import edu.ntnu.idi.idatt.backend.game.application.GameReadMode -import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver -import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import edu.ntnu.idi.idatt.backend.game.tasks.domain.Task import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskItem @@ -19,6 +20,9 @@ import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskPassingRule import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskTranslation import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskTranslationId import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository +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 import org.springframework.dao.DataIntegrityViolationException import org.springframework.http.HttpStatus import org.springframework.stereotype.Service @@ -33,8 +37,18 @@ class TaskService( private val taskRepository: TaskRepository, private val classroomRepository: ClassroomRepository, private val currentUserResolver: CurrentUserResolver, + private val pupilStopProgressService: PupilStopProgressService, private val gameAccessContextResolver: GameAccessContextResolver, ) { + /** + * Lists tasks for a classroom, optionally filtered by stop. + * + * @param currentUser The user requesting the list. + * @param classroomId The ID of the classroom. + * @param stopId Optional stop ID to filter tasks. + * @param readMode The read mode to determine access level. + * @return A list of task summaries. + */ @Transactional(readOnly = true) fun listTasks( currentUser: CurrentUser, @@ -53,6 +67,16 @@ class TaskService( .map { it.toSummary() } } + /** + * Retrieves a specific task by its ID. + * + * @param currentUser The user requesting the task. + * @param classroomId The ID of the classroom. + * @param taskId The ID of the task. + * @param readMode The read mode to determine access level. + * @return The task details and whether answers are included. + * @throws ResponseStatusException if the user cannot view unpublished tasks. + */ @Transactional(readOnly = true) fun getTask( currentUser: CurrentUser, @@ -71,6 +95,12 @@ class TaskService( ) } + /** + * Creates a new task for a classroom. + * + * @param command The command containing task details. + * @return The created task details. + */ @Transactional fun createTask(command: CreateTaskCommand): TaskDetails { val teacher = currentUserResolver.requireTeacherOrAdmin(command.authenticatedSubject) @@ -104,6 +134,12 @@ class TaskService( return saveTask(task).toDetails() } + /** + * Updates an existing task. + * + * @param command The command containing updated task details. + * @return The updated task details. + */ @Transactional fun updateTask(command: UpdateTaskCommand): TaskDetails { requireOwnedClassroom(command.authenticatedSubject, command.classroomId) @@ -144,6 +180,15 @@ class TaskService( return saveTask(task).toDetails() } + /** + * Updates the publication state of a task. + * + * @param currentUser The user performing the update. + * @param classroomId The ID of the classroom. + * @param taskId The ID of the task. + * @param published The new publication state. + * @return The updated task details. + */ @Transactional fun updatePublishState( currentUser: CurrentUser, @@ -160,6 +205,13 @@ class TaskService( return saveTask(task).toDetails() } + /** + * Deletes a task from a classroom. + * + * @param currentUser The user performing the deletion. + * @param classroomId The ID of the classroom. + * @param taskId The ID of the task. + */ @Transactional fun deleteTask( currentUser: CurrentUser, @@ -171,6 +223,74 @@ class TaskService( taskRepository.delete(task) } + /** + * Submits answers for all published tasks at a stop. + * + * @param command The command containing the submitted answers. + * @return The result of the stop submission. + * @throws ResponseStatusException if submission is invalid or forbidden. + */ + @Transactional + fun submitStopAnswers(command: SubmitStopAnswersCommand): StopSubmissionResult { + val (_, user) = requireParticipatingClassroom(command.authenticatedSubject, command.classroomId) + if (user.role != UserRole.PUPIL) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only pupils may submit stop answers") + } + + val pupilId = requireNotNull(user.id) { "Authenticated pupil is missing an id" } + val progress = pupilStopProgressService.getProgressForStop(pupilId, command.classroomId, command.stopId) + if (progress.status == StopProgressStatus.LOCKED) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "Stop is locked") + } + + val tasks = taskRepository.findAllByClassroomIdAndStopIdOrderByDifficultyLevelAsc(command.classroomId, command.stopId) + .filter { it.isPublished } + + if (tasks.isEmpty()) { + throw ResponseStatusException(HttpStatus.NOT_FOUND, "No published tasks found for stop") + } + + val answersByTaskId = command.taskAnswers.associateBy { it.taskId } + val expectedTaskIds = tasks.map { requireNotNull(it.id) }.toSet() + val unexpectedTaskIds = answersByTaskId.keys - expectedTaskIds + if (unexpectedTaskIds.isNotEmpty()) { + throw ResponseStatusException( + HttpStatus.BAD_REQUEST, + "Submitted answers include tasks outside the requested stop", + ) + } + + val taskResults = tasks.map { task -> + val taskId = requireNotNull(task.id) + val taskAnswer = answersByTaskId[taskId] + ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Missing answer for task $taskId") + evaluateTaskSubmission(task, taskAnswer) + } + + val totalScore = taskResults.sumOf { it.score } + val totalMaxScore = tasks.sumOf { it.maxScore } + val passed = taskResults.all { it.passed } + val updatedProgress = updateProgressAfterSubmission( + pupilId = pupilId, + classroomId = command.classroomId, + stopId = command.stopId, + currentStatus = progress.status, + score = totalScore, + passed = passed, + firstFailedTaskId = taskResults.firstOrNull { !it.passed }?.taskId, + ) + + return StopSubmissionResult( + stopId = command.stopId, + passed = passed, + score = totalScore, + maxScore = totalMaxScore, + stopStatus = updatedProgress.status.name, + completedAt = updatedProgress.completedAt, + taskResults = taskResults, + ) + } + private fun requireOwnedClassroom(authenticatedSubject: String, classroomId: Long): Classroom { val user = currentUserResolver.requireTeacherOrAdmin(authenticatedSubject) val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } @@ -184,6 +304,26 @@ class TaskService( return classroom } + private fun requireParticipatingClassroom(authenticatedSubject: String, classroomId: Long): Pair { + val user = currentUserResolver.requireUser(authenticatedSubject) + val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } + val classroom = classroomRepository.findById(classroomId) + .orElseThrow { + ResponseStatusException(HttpStatus.NOT_FOUND, "Classroom not found") + } + + val hasAccess = when (user.role) { + UserRole.ADMIN -> true + UserRole.TEACHER -> classroom.ownerTeacherId == userId + UserRole.PUPIL -> classroom.hasPupilMembership(userId) + } + + if (!hasAccess) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "User does not have access to this classroom") + } + + return Pair(classroom, user) + } private fun requireTask(classroomId: Long, taskId: Long): Task = taskRepository.findByIdAndClassroomId(taskId, classroomId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Task not found") @@ -368,6 +508,171 @@ class TaskService( } } + private fun evaluateTaskSubmission( + task: Task, + taskAnswer: SubmitTaskAnswerCommand, + ): TaskSubmissionResult = + evaluateOptionBasedTask(task, taskAnswer) + + private fun evaluateOptionBasedTask( + task: Task, + taskAnswer: SubmitTaskAnswerCommand, + ): TaskSubmissionResult { + val answerByItemId = taskAnswer.itemAnswers.associateBy { it.itemId } + val expectedItemIds = task.items.mapNotNull { it.id }.toSet() + val unexpectedItemIds = answerByItemId.keys - expectedItemIds + if (unexpectedItemIds.isNotEmpty()) { + throw ResponseStatusException( + HttpStatus.BAD_REQUEST, + "Submitted answers include items outside task ${requireNotNull(task.id)}", + ) + } + + val baseItemScore = if (task.items.isEmpty()) 0 else task.maxScore / task.items.size + var score = 0 + val feedback = mutableListOf() + var allAnswersCorrect = true + + task.items.forEach { item -> + val itemId = requireNotNull(item.id) + val itemAnswer = answerByItemId[itemId] + ?: throw ResponseStatusException( + HttpStatus.BAD_REQUEST, + "Missing answer for item $itemId in task ${requireNotNull(task.id)}", + ) + val selectedOption = item.options.firstOrNull { it.id == itemAnswer.selectedOptionId } + ?: throw ResponseStatusException( + HttpStatus.BAD_REQUEST, + "Selected option ${itemAnswer.selectedOptionId} does not belong to item $itemId", + ) + if (selectedOption.isCorrect) { + score += baseItemScore + } else { + allAnswersCorrect = false + selectedOption.resolveExplanationText() + .takeIf { it.nb != null || it.en != null } + ?.let(feedback::add) + } + } + + if (allAnswersCorrect) { + score = task.maxScore + } + + return TaskSubmissionResult( + taskId = requireNotNull(task.id), + title = task.resolveTitle(), + passed = passesTask(task, score), + score = score, + maxScore = task.maxScore, + feedbackText = combineFeedback(feedback), + ) + } + + private fun passesTask(task: Task, score: Int): Boolean = + when (task.passingRule) { + TaskPassingRule.ALL_CORRECT -> score >= task.maxScore + TaskPassingRule.MINIMUM_SCORE -> score >= (task.passingScore ?: 0) + } + + private fun updateProgressAfterSubmission( + pupilId: Long, + classroomId: Long, + stopId: Long, + currentStatus: StopProgressStatus, + score: Int, + passed: Boolean, + firstFailedTaskId: Long?, + ) = + when { + passed && currentStatus == StopProgressStatus.NOT_STARTED -> { + pupilStopProgressService.updateProgress( + pupilId, + classroomId, + stopId, + UpdateStopProgressCommand( + status = StopProgressStatus.IN_PROGRESS, + currentTaskId = null, + bestScore = score, + medalAwarded = null, + ), + ) + pupilStopProgressService.updateProgress( + pupilId, + classroomId, + stopId, + UpdateStopProgressCommand( + status = StopProgressStatus.COMPLETED, + currentTaskId = null, + bestScore = score, + medalAwarded = true, + ), + ) + } + + passed && currentStatus == StopProgressStatus.IN_PROGRESS -> pupilStopProgressService.updateProgress( + pupilId, + classroomId, + stopId, + UpdateStopProgressCommand( + status = StopProgressStatus.COMPLETED, + currentTaskId = null, + bestScore = score, + medalAwarded = true, + ), + ) + + passed -> pupilStopProgressService.updateProgress( + pupilId, + classroomId, + stopId, + UpdateStopProgressCommand( + status = null, + currentTaskId = null, + bestScore = score, + medalAwarded = true, + ), + ) + + currentStatus == StopProgressStatus.NOT_STARTED -> pupilStopProgressService.updateProgress( + pupilId, + classroomId, + stopId, + UpdateStopProgressCommand( + status = StopProgressStatus.IN_PROGRESS, + currentTaskId = firstFailedTaskId, + bestScore = score, + medalAwarded = null, + ), + ) + + else -> pupilStopProgressService.updateProgress( + pupilId, + classroomId, + stopId, + UpdateStopProgressCommand( + status = null, + currentTaskId = firstFailedTaskId, + bestScore = score, + medalAwarded = null, + ), + ) + } + + private fun combineFeedback(values: List): LocalizedOptionalText? { + if (values.isEmpty()) return null + return LocalizedOptionalText( + nb = values.mapNotNull { it.nb?.trim()?.takeIf(String::isNotBlank) } + .distinct() + .takeIf { it.isNotEmpty() } + ?.joinToString("\n\n"), + en = values.mapNotNull { it.en?.trim()?.takeIf(String::isNotBlank) } + .distinct() + .takeIf { it.isNotEmpty() } + ?.joinToString("\n\n"), + ) + } + private fun requireUniquePositiveOrders(values: List, fieldName: String) { if (values.any { it <= 0 }) { throw ResponseStatusException(HttpStatus.BAD_REQUEST, "$fieldName must be greater than zero") diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt index 2986aec2..8b1dd4a2 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt @@ -3,6 +3,7 @@ package edu.ntnu.idi.idatt.backend.game.mapstops import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom import edu.ntnu.idi.idatt.backend.game.application.GameAccessContext import edu.ntnu.idi.idatt.backend.game.application.GameAccessContextResolver +import edu.ntnu.idi.idatt.backend.game.application.GameReadMode import edu.ntnu.idi.idatt.backend.game.mapstops.application.MapStopService import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgress @@ -10,10 +11,14 @@ import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgressId import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgressRepository -import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser +import edu.ntnu.idi.idatt.backend.game.tasks.domain.Task +import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskPassingRule +import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskType +import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository 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.security.CurrentUser import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows @@ -22,17 +27,31 @@ import org.springframework.http.HttpStatus import org.springframework.web.server.ResponseStatusException class MapStopServiceTests { + private data class TestContext( + val mapStopsRepository: MapStopsRepository, + val progressRepository: PupilStopProgressRepository, + val resolver: GameAccessContextResolver, + val taskRepository: TaskRepository, + val service: MapStopService, + ) + + private fun serviceWithMocks(): TestContext { + val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) + val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val taskRepository = Mockito.mock(TaskRepository::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver, taskRepository) + return TestContext(mapStopsRepository, progressRepository, resolver, taskRepository, service) + } @Test fun `get all map stops returns active stops in display order`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, Mockito.mock(GameAccessContextResolver::class.java)) + val context = serviceWithMocks() val stops = listOf(mapStop(id = 1L, displayOrder = 1), mapStop(id = 2L, displayOrder = 2)) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(stops) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(stops) - val result = service.getAllMapStops() + val result = context.service.getAllMapStops() assertEquals(2, result.size) assertEquals(1, result[0].displayOrder) @@ -41,27 +60,23 @@ class MapStopServiceTests { @Test fun `get all map stops returns empty list when no active stops exist`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, Mockito.mock(GameAccessContextResolver::class.java)) + val context = serviceWithMocks() - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(emptyList()) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(emptyList()) - val result = service.getAllMapStops() + val result = context.service.getAllMapStops() assertEquals(0, result.size) } @Test fun `get map stop by slug throws 404 when no stop matches`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, Mockito.mock(GameAccessContextResolver::class.java)) + val context = serviceWithMocks() - Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("not a stop")).thenReturn(null) + Mockito.`when`(context.mapStopsRepository.findBySlugIgnoreCase("not a stop")).thenReturn(null) val exception = assertThrows { - service.getMapStopBySlug("not-a-stop") + context.service.getMapStopBySlug("not-a-stop") } assertEquals(HttpStatus.NOT_FOUND, exception.statusCode) @@ -69,17 +84,15 @@ class MapStopServiceTests { @Test fun `get map overview falls back to LOCKED when pupil has no progress record for a stop`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 10L, displayOrder = 1) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(emptyList()) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(emptyList()) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)).thenReturn(emptyList()) - val result = service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) + val result = context.service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) assertEquals(1, result.size) assertEquals(StopProgressStatus.LOCKED, result[0].status) @@ -89,74 +102,76 @@ class MapStopServiceTests { @Test fun `get map overview reflects pupil progress status and stars when record exists`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 10L, displayOrder = 1, maxScore = 100) val progress = progress(stopId = 10L, status = StopProgressStatus.COMPLETED, bestScore = 80) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)) + .thenReturn(listOf(publishedTask(stopId = 10L, maxScore = 100))) - val result = service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) + val result = context.service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) assertEquals(StopProgressStatus.COMPLETED, result[0].status) - assertEquals(3, result[0].stars) // 80/100 = 0.80 ≥ 0.75 → 3 stars + assertEquals(3, result[0].stars) } @Test fun `get map overview returns empty list when there are no active stops`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(emptyList()) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(emptyList()) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(emptyList()) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(emptyList()) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)).thenReturn(emptyList()) - val result = service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) + val result = context.service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) assertEquals(0, result.size) } @Test fun `get map stop overview by slug returns enriched entry for pupil with progress`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 5L, slug = "data-center", maxScore = 100) val progress = progress(stopId = 5L, status = StopProgressStatus.IN_PROGRESS, bestScore = 50) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("data-center")).thenReturn(stop) - Mockito.`when`(progressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId(1L, 2L, 5L)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findBySlugIgnoreCase("data-center")).thenReturn(stop) + Mockito.`when`(context.progressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId(1L, 2L, 5L)) .thenReturn(progress) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)) + .thenReturn(listOf(publishedTask(stopId = 5L, maxScore = 100))) - val result = service.getMapStopOverviewBySlug(currentUser = pupilCurrentUser(), classroomId = 2L, slug = "data-center") + val result = context.service.getMapStopOverviewBySlug( + currentUser = pupilCurrentUser(), + classroomId = 2L, + slug = "data-center", + ) assertEquals(5L, result.stopId) assertEquals(StopProgressStatus.IN_PROGRESS, result.status) - assertEquals(2, result.stars) // 50/100 = 0.50 ≥ 0.50 → 2 stars + assertEquals(2, result.stars) } @Test fun `get map stop overview by slug falls back to LOCKED when pupil has no progress`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 5L, slug = "data-center") - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("data-center")).thenReturn(stop) - Mockito.`when`(progressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId(1L, 2L, 5L)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findBySlugIgnoreCase("data-center")).thenReturn(stop) + Mockito.`when`(context.progressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId(1L, 2L, 5L)) .thenReturn(null) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)).thenReturn(emptyList()) - val result = service.getMapStopOverviewBySlug(currentUser = pupilCurrentUser(), classroomId = 2L, slug = "data-center") + val result = context.service.getMapStopOverviewBySlug( + currentUser = pupilCurrentUser(), + classroomId = 2L, + slug = "data-center", + ) assertEquals(StopProgressStatus.LOCKED, result.status) assertEquals(0, result.stars) @@ -164,16 +179,17 @@ class MapStopServiceTests { @Test fun `get map stop overview by slug throws 404 for unknown slug`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("data center")).thenReturn(null) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findBySlugIgnoreCase("data center")).thenReturn(null) val exception = assertThrows { - service.getMapStopOverviewBySlug(currentUser = pupilCurrentUser(), classroomId = 2L, slug = "data-center") + context.service.getMapStopOverviewBySlug( + currentUser = pupilCurrentUser(), + classroomId = 2L, + slug = "data-center", + ) } assertEquals(HttpStatus.NOT_FOUND, exception.statusCode) @@ -181,66 +197,67 @@ class MapStopServiceTests { @Test fun `get map overview awards 0 stars when best score is below 25 percent of max`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 1L, maxScore = 100) val progress = progress(stopId = 1L, bestScore = 24) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)) + .thenReturn(listOf(publishedTask(stopId = 1L, maxScore = 100))) - assertEquals(0, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) + assertEquals(0, context.service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } @Test fun `get map overview awards 1 star when best score is exactly 25 percent of max`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 1L, maxScore = 100) val progress = progress(stopId = 1L, bestScore = 25) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)) + .thenReturn(listOf(publishedTask(stopId = 1L, maxScore = 100))) - assertEquals(1, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) + assertEquals(1, context.service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } @Test fun `get map overview awards 2 stars when best score is exactly 50 percent of max`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 1L, maxScore = 100) val progress = progress(stopId = 1L, bestScore = 50) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)) + .thenReturn(listOf(publishedTask(stopId = 1L, maxScore = 100))) - assertEquals(2, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) + assertEquals(2, context.service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } @Test fun `get map overview awards 0 stars when max score is zero`() { - val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) - val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val resolver = Mockito.mock(GameAccessContextResolver::class.java) - val service = MapStopService(mapStopsRepository, progressRepository, resolver) + val context = serviceWithMocks() val stop = mapStop(id = 1L, maxScore = 0) val progress = progress(stopId = 1L, bestScore = 100) - Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) - Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) - Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + stubPupilRead(context) + Mockito.`when`(context.mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) + Mockito.`when`(context.progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) + Mockito.`when`(context.taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(2L)).thenReturn(emptyList()) + + assertEquals(0, context.service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) + } - assertEquals(0, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) + private fun stubPupilRead(context: TestContext) { + Mockito.`when`( + context.resolver.resolveReadContext(pupilCurrentUser(), 2L, GameReadMode.DEFAULT), + ).thenReturn(pupilAccessContext()) } private fun pupilCurrentUser(): CurrentUser = @@ -309,4 +326,23 @@ class MapStopServiceTests { this.medalAwarded = medalAwarded } } + + private fun publishedTask(stopId: Long, maxScore: Int): Task = + Task( + stopId = stopId, + classroom = Classroom(ownerTeacherId = 1L, title = "Test Classroom"), + createdByTeacher = User( + id = 2L, + email = "teacher@example.com", + passwordHash = "hash", + role = UserRole.TEACHER, + status = UserStatus.ACTIVE, + ), + title = "Task $stopId", + difficultyLevel = 1, + taskType = TaskType.GENERIC, + passingRule = TaskPassingRule.ALL_CORRECT, + maxScore = maxScore, + isPublished = true, + ) } diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/PupilStopProgressServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/PupilStopProgressServiceTests.kt index 50bc07da..8a0481f6 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/PupilStopProgressServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/PupilStopProgressServiceTests.kt @@ -243,6 +243,32 @@ class PupilStopProgressServiceTests { assertEquals(7L, result.currentTaskId) } + @Test + fun `update progress clears current task id when stop completes`() { + val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) + val mapStopRepository = Mockito.mock(MapStopsRepository::class.java) + val service = PupilStopProgressService(progressRepository, mapStopRepository) + val record = progress(stopId = 1L, status = StopProgressStatus.IN_PROGRESS).apply { + currentTaskId = 7L + } + + stubFindAndSave(progressRepository, record) + Mockito.`when`(mapStopRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()) + .thenReturn(listOf(MapStop().apply { id = 1L })) + + val result = service.updateProgress( + pupilUserId = 1L, classroomId = 2L, stopId = 1L, + command = UpdateStopProgressCommand( + status = StopProgressStatus.COMPLETED, + currentTaskId = null, + bestScore = null, + medalAwarded = null, + ), + ) + + assertNull(result.currentTaskId) + } + @Test fun `update progress awards medal when medal flag is set`() { val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) @@ -314,4 +340,4 @@ class PupilStopProgressServiceTests { stubFind(repo, record) Mockito.`when`(repo.save(any(PupilStopProgress::class.java))).thenAnswer { it.arguments[0] } } -} \ No newline at end of file +} diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/TaskApiIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/TaskApiIntegrationTests.kt index ef9e232b..539f983a 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/TaskApiIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/TaskApiIntegrationTests.kt @@ -10,6 +10,12 @@ 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.RefreshTokenRepository import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgress +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgressId +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus +import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository +import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgressRepository import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository import edu.ntnu.idi.idatt.backend.users.avatar.infrastructure.UserAvatarRepository import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository @@ -46,6 +52,12 @@ class TaskApiIntegrationTests { @Autowired private lateinit var taskRepository: TaskRepository + @Autowired + private lateinit var mapStopsRepository: MapStopsRepository + + @Autowired + private lateinit var pupilStopProgressRepository: PupilStopProgressRepository + @Autowired private lateinit var refreshTokenRepository: RefreshTokenRepository @@ -66,7 +78,9 @@ class TaskApiIntegrationTests { @BeforeEach fun setUp() { refreshTokenRepository.deleteAll() + pupilStopProgressRepository.deleteAll() taskRepository.deleteAll() + mapStopsRepository.deleteAll() classroomRepository.deleteAll() userAvatarRepository.deleteAll() pupilProfileRepository.deleteAll() @@ -314,6 +328,402 @@ class TaskApiIntegrationTests { } } + @Test + fun `pupil can submit wrong stop answers and receive task feedback`() { + val owner = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(owner, "TASK48") + val stop = createMapStop(slug = "nyhetskvartalet", title = "News Quarter", displayOrder = 1) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + + val createdBody = readJson( + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = newsComparisonTaskPayload(stopId = requireNotNull(stop.id)) + }.andExpect { + status { isCreated() } + }.andReturn().response.contentAsString, + ) + val taskId = createdBody.get("id").asLong() + val taskItemId = createdBody.get("items")[0].get("id").asLong() + val wrongOptionId = createdBody.get("items")[0].get("options")[0].get("id").asLong() + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/tasks/$taskId/publish") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = """{"published":true}""" + }.andExpect { + status { isOk() } + } + + val pupil = userRepository.save(activePupil("submitter_wrong")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + createStopProgress(pupil, classroom, stop, StopProgressStatus.NOT_STARTED) + val pupilAccessToken = pupilAccessToken("submitter_wrong", "secret123") + + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks/submit-stop") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """ + { + "stopId": ${requireNotNull(stop.id)}, + "taskAnswers": [ + { + "taskId": $taskId, + "itemAnswers": [ + { + "itemId": $taskItemId, + "selectedOptionId": $wrongOptionId + } + ] + } + ] + } + """.trimIndent() + }.andExpect { + status { isOk() } + jsonPath("$.passed") { value(false) } + jsonPath("$.stopStatus") { value("IN_PROGRESS") } + jsonPath("$.taskResults[0].passed") { value(false) } + jsonPath("$.taskResults[0].feedbackText.en") { + value("This article uses sensational language and makes unsupported claims.") + } + } + + val progress = pupilStopProgressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId( + requireNotNull(pupil.id), + requireNotNull(classroom.id), + requireNotNull(stop.id), + ) + assertEquals(StopProgressStatus.IN_PROGRESS, progress?.status) + assertEquals(taskId, progress?.currentTaskId) + } + + @Test + fun `pupil can submit correct stop answers and complete the stop`() { + val owner = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(owner, "TASK49") + val stop = createMapStop(slug = "nyhetskvartalet", title = "News Quarter", displayOrder = 1) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + + val createdBody = readJson( + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = newsComparisonTaskPayload(stopId = requireNotNull(stop.id)) + }.andExpect { + status { isCreated() } + }.andReturn().response.contentAsString, + ) + val taskId = createdBody.get("id").asLong() + val taskItemId = createdBody.get("items")[0].get("id").asLong() + val correctOptionId = createdBody.get("items")[0].get("options")[1].get("id").asLong() + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/tasks/$taskId/publish") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = """{"published":true}""" + }.andExpect { + status { isOk() } + } + + val pupil = userRepository.save(activePupil("submitter_correct")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + createStopProgress(pupil, classroom, stop, StopProgressStatus.NOT_STARTED) + val pupilAccessToken = pupilAccessToken("submitter_correct", "secret123") + + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks/submit-stop") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """ + { + "stopId": ${requireNotNull(stop.id)}, + "taskAnswers": [ + { + "taskId": $taskId, + "itemAnswers": [ + { + "itemId": $taskItemId, + "selectedOptionId": $correctOptionId + } + ] + } + ] + } + """.trimIndent() + }.andExpect { + status { isOk() } + jsonPath("$.passed") { value(true) } + jsonPath("$.score") { value(100) } + jsonPath("$.stopStatus") { value("COMPLETED") } + jsonPath("$.taskResults[0].passed") { value(true) } + } + + val progress = pupilStopProgressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId( + requireNotNull(pupil.id), + requireNotNull(classroom.id), + requireNotNull(stop.id), + ) + assertEquals(StopProgressStatus.COMPLETED, progress?.status) + assertEquals(100, progress?.bestScore) + assertEquals(true, progress?.medalAwarded) + assertEquals(null, progress?.currentTaskId) + } + + @Test + fun `completed stop can be submitted again and keeps highest score`() { + val owner = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(owner, "TASK50") + val stop = createMapStop(slug = "nyhetskvartalet", title = "News Quarter", displayOrder = 1) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + + val createdBody = readJson( + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = newsComparisonTaskPayload(stopId = requireNotNull(stop.id)) + }.andExpect { + status { isCreated() } + }.andReturn().response.contentAsString, + ) + val taskId = createdBody.get("id").asLong() + val taskItemId = createdBody.get("items")[0].get("id").asLong() + val correctOptionId = createdBody.get("items")[0].get("options")[1].get("id").asLong() + val wrongOptionId = createdBody.get("items")[0].get("options")[0].get("id").asLong() + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/tasks/$taskId/publish") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = """{"published":true}""" + }.andExpect { + status { isOk() } + } + + val pupil = userRepository.save(activePupil("submitter_completed")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + createStopProgress(pupil, classroom, stop, StopProgressStatus.COMPLETED) + // Set initial best score to 50 + val progress = pupilStopProgressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId( + requireNotNull(pupil.id), + requireNotNull(classroom.id), + requireNotNull(stop.id), + ) + progress?.bestScore = 50 + pupilStopProgressRepository.save(progress!!) + + val pupilAccessToken = pupilAccessToken("submitter_completed", "secret123") + + // 1. Submit with a lower score + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks/submit-stop") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """ + { + "stopId": ${requireNotNull(stop.id)}, + "taskAnswers": [ + { + "taskId": $taskId, + "itemAnswers": [ + { + "itemId": $taskItemId, + "selectedOptionId": $wrongOptionId + } + ] + } + ] + } + """.trimIndent() + }.andExpect { + status { isOk() } + jsonPath("$.score") { value(0) } + } + + val progressAfterLower = pupilStopProgressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId( + requireNotNull(pupil.id), + requireNotNull(classroom.id), + requireNotNull(stop.id), + ) + assertEquals(50, progressAfterLower?.bestScore) + + // 2. Submit with a higher score + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks/submit-stop") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """ + { + "stopId": ${requireNotNull(stop.id)}, + "taskAnswers": [ + { + "taskId": $taskId, + "itemAnswers": [ + { + "itemId": $taskItemId, + "selectedOptionId": $correctOptionId + } + ] + } + ] + } + """.trimIndent() + }.andExpect { + status { isOk() } + jsonPath("$.score") { value(100) } + } + + val progressAfterHigher = pupilStopProgressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId( + requireNotNull(pupil.id), + requireNotNull(classroom.id), + requireNotNull(stop.id), + ) + assertEquals(100, progressAfterHigher?.bestScore) + } + + @Test + fun `pupil can submit option based stop answers and receive explanation for wrong option`() { + val owner = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(owner, "TASK51") + val stop = createMapStop(slug = "bildekvartalet", title = "Image Quarter", displayOrder = 1) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + + val createdBody = readJson( + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = optionTaskPayload(stopId = requireNotNull(stop.id)) + }.andExpect { + status { isCreated() } + }.andReturn().response.contentAsString, + ) + val taskId = createdBody.get("id").asLong() + val taskItemId = createdBody.get("items")[0].get("id").asLong() + val wrongOptionId = createdBody.get("items")[0].get("options")[1].get("id").asLong() + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/tasks/$taskId/publish") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = """{"published":true}""" + }.andExpect { + status { isOk() } + } + + val pupil = userRepository.save(activePupil("submitter_option_wrong")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + createStopProgress(pupil, classroom, stop, StopProgressStatus.NOT_STARTED) + val pupilAccessToken = pupilAccessToken("submitter_option_wrong", "secret123") + + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks/submit-stop") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """ + { + "stopId": ${requireNotNull(stop.id)}, + "taskAnswers": [ + { + "taskId": $taskId, + "itemAnswers": [ + { + "itemId": $taskItemId, + "selectedOptionId": $wrongOptionId + } + ] + } + ] + } + """.trimIndent() + }.andExpect { + status { isOk() } + jsonPath("$.passed") { value(false) } + jsonPath("$.stopStatus") { value("IN_PROGRESS") } + jsonPath("$.taskResults[0].passed") { value(false) } + jsonPath("$.taskResults[0].feedbackText.en") { + value("This option ignores the warning signs in the image.") + } + } + } + + @Test + fun `pupil wrong option without explanation still fails task`() { + val owner = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(owner, "TASK52") + val stop = createMapStop(slug = "bildekvartalet", title = "Image Quarter", displayOrder = 1) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + + val createdBody = readJson( + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = optionTaskPayload(stopId = requireNotNull(stop.id), includeWrongExplanation = false) + }.andExpect { + status { isCreated() } + }.andReturn().response.contentAsString, + ) + val taskId = createdBody.get("id").asLong() + val taskItemId = createdBody.get("items")[0].get("id").asLong() + val wrongOptionId = createdBody.get("items")[0].get("options")[1].get("id").asLong() + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/tasks/$taskId/publish") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = """{"published":true}""" + }.andExpect { + status { isOk() } + } + + val pupil = userRepository.save(activePupil("submitter_option_no_feedback")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + createStopProgress(pupil, classroom, stop, StopProgressStatus.NOT_STARTED) + val pupilAccessToken = pupilAccessToken("submitter_option_no_feedback", "secret123") + + mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks/submit-stop") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """ + { + "stopId": ${requireNotNull(stop.id)}, + "taskAnswers": [ + { + "taskId": $taskId, + "itemAnswers": [ + { + "itemId": $taskItemId, + "selectedOptionId": $wrongOptionId + } + ] + } + ] + } + """.trimIndent() + }.andExpect { + status { isOk() } + jsonPath("$.passed") { value(false) } + jsonPath("$.score") { value(0) } + jsonPath("$.stopStatus") { value("IN_PROGRESS") } + jsonPath("$.taskResults[0].passed") { value(false) } + jsonPath("$.taskResults[0].feedbackText") { doesNotExist() } + } + } + private fun createClassroom(owner: User, joinCode: String): Classroom = classroomRepository.save( Classroom( @@ -325,6 +735,34 @@ class TaskApiIntegrationTests { ), ) + private fun createMapStop(slug: String, title: String, displayOrder: Int): MapStop = + mapStopsRepository.save( + MapStop( + slug = slug, + title = title, + displayOrder = displayOrder, + maxScore = 100, + isActive = true, + ), + ) + + private fun createStopProgress( + pupil: User, + classroom: Classroom, + stop: MapStop, + status: StopProgressStatus, + ): PupilStopProgress = + pupilStopProgressRepository.save( + PupilStopProgress( + id = PupilStopProgressId(requireNotNull(pupil.id), requireNotNull(classroom.id), requireNotNull(stop.id)), + pupil = pupil, + classroom = classroom, + stop = stop, + ).apply { + this.status = status + }, + ) + private fun teacherAccessToken(email: String, password: String): String = readJson( mockMvc.post("/api/v1/auth/teacher/login") { @@ -402,4 +840,140 @@ class TaskApiIntegrationTests { ] } """.trimIndent() + + private fun jsonString(value: String): String = jsonMapper.writeValueAsString(value) + + private fun newsComparisonMetadataJson(): String = + """ + { + "articles": [ + { + "optionOrder": 1, + "domain": "clickbait.example", + "headline": { + "nb": "Sensasjonell artikkel", + "en": "Sensational article" + }, + "body": { + "nb": "Denne artikkelen bruker sensasjonelt språk og udokumenterte påstander.", + "en": "This article uses sensational language and makes unsupported claims." + }, + "mediaUrl": null + }, + { + "optionOrder": 2, + "domain": "news.example", + "headline": { + "nb": "Nøktern artikkel", + "en": "Measured article" + }, + "body": { + "nb": "Denne artikkelen oppgir kilde og forklarer fakta på en etterprøvbar måte.", + "en": "This article names its source and explains the facts in a verifiable way." + }, + "mediaUrl": null + } + ] + } + """.trimIndent() + + private fun newsComparisonTaskPayload(stopId: Long): String = + """ + { + "stopId": $stopId, + "title": {"nb":"Finn den troverdige artikkelen","en":"Find the trustworthy article"}, + "introText": {"nb":"Velg artikkelen som er mest troverdig.","en":"Pick the article that is most trustworthy."}, + "difficultyLevel": 1, + "taskType": "NEWS_COMPARISON", + "passingRule": "ALL_CORRECT", + "passingScore": 100, + "maxScore": 100, + "items": [ + { + "itemOrder": 1, + "promptText": {"nb":"Hvilken artikkel er mest troverdig?","en":"Which article is most trustworthy?"}, + "metadataJson": ${jsonString(newsComparisonMetadataJson())}, + "options": [ + { + "optionOrder": 1, + "optionText": { + "nb":"Sensasjonell artikkel", + "en":"Sensational article" + }, + "isCorrect": false, + "explanationText": { + "nb":"Denne artikkelen bruker sensasjonelt språk og udokumenterte påstander.", + "en":"This article uses sensational language and makes unsupported claims." + } + }, + { + "optionOrder": 2, + "optionText": { + "nb":"Nøktern artikkel", + "en":"Measured article" + }, + "isCorrect": true, + "explanationText": { + "nb":"Denne artikkelen oppgir kilde og forklarer fakta på en etterprøvbar måte.", + "en":"This article names its source and explains the facts in a verifiable way." + } + } + ] + } + ] + } + """.trimIndent() + + private fun optionTaskPayload( + stopId: Long, + includeWrongExplanation: Boolean = true, + ): String { + val wrongExplanation = + if (includeWrongExplanation) { + """ + "explanationText": { + "nb":"Dette alternativet overser faresignalene i bildet.", + "en":"This option ignores the warning signs in the image." + } + """.trimIndent() + } else { + "" + } + + return """ + { + "stopId": $stopId, + "title": {"nb":"Vurder bildet","en":"Assess the image"}, + "introText": {"nb":"Velg vurderingen som passer best.","en":"Choose the assessment that fits best."}, + "difficultyLevel": 1, + "taskType": "IMAGE_ASSESSMENT", + "passingRule": "ALL_CORRECT", + "passingScore": 100, + "maxScore": 100, + "items": [ + { + "itemOrder": 1, + "promptText": {"nb":"Hva er riktig vurdering?","en":"What is the correct assessment?"}, + "metadataJson": "{\"imageUrl\":\"https://example.com/warning-sign.jpg\"}", + "options": [ + { + "optionOrder": 1, + "optionText": {"nb":"Bildet viser tydelige faresignaler.","en":"The image shows clear warning signs."}, + "isCorrect": true, + "explanationText": { + "nb":"Dette er riktig fordi faresignalene er tydelige i motivet.", + "en":"This is correct because the warning signs are clearly visible in the scene." + } + }, + { + "optionOrder": 2, + "optionText": {"nb":"Bildet ser helt trygt ut.","en":"The image looks completely safe."}, + "isCorrect": false${if (wrongExplanation.isNotBlank()) ",\n $wrongExplanation" else ""} + } + ] + } + ] + } + """.trimIndent() + } }