From d8adb5eba78edf53eeb940c7da5cde8b77529124 Mon Sep 17 00:00:00 2001 From: kristoffer Date: Thu, 23 Apr 2026 10:33:44 +0200 Subject: [PATCH 1/2] Bootstrapped postkontoret and new user with everything unlocked --- .../backend/bootstrap/DevDataBootstrap.kt | 64 +++- .../bootstrap/tasks/PostkontoretTaskSeeds.kt | 317 ++++++++++++++---- 2 files changed, 308 insertions(+), 73 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt index b1a4d9c5..89a9b19f 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 @@ -9,6 +9,10 @@ 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.game.mapstops.application.PupilProgressSeedingService +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.PupilStopProgressRepository import edu.ntnu.idi.idatt.backend.iam.domain.RefreshToken import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole @@ -58,6 +62,7 @@ class DevDataBootstrap( private val mapStopBootstrap: MapStopBootstrap, private val taskBootstrap: TaskBootstrap, private val pupilProgressSeedingService: PupilProgressSeedingService, + private val pupilStopProgressRepository: PupilStopProgressRepository, ) : ApplicationRunner { private val logger = LoggerFactory.getLogger(javaClass) @@ -83,6 +88,11 @@ class DevDataBootstrap( password = "Pupil123!", role = UserRole.PUPIL, ) + val pupilSofia = seedUser( + username = "sofia", + password = "Pupil123!", + role = UserRole.PUPIL, + ) seedTeacherProfile(teacher, "Ada Lunde", "Trondheim Montessori") val sampleClassroom = seedClassroom( @@ -93,10 +103,13 @@ class DevDataBootstrap( ) seedClassroomMembership(sampleClassroom, pupilAda, "Ada") seedClassroomMembership(sampleClassroom, pupilNoah, "Noah") + seedClassroomMembership(sampleClassroom, pupilSofia, "Sofia") seedPupilProfile(pupilAda, "Ada", sampleClassroom.id) seedPupilProfile(pupilNoah, "Noah", sampleClassroom.id) + seedPupilProfile(pupilSofia, "Sofia", sampleClassroom.id) seedPupilAvatar(pupilAda) seedPupilAvatar(pupilNoah) + seedPupilAvatar(pupilSofia) seedPupilGameProgress( pupil = pupilAda, classroom = sampleClassroom, @@ -119,7 +132,17 @@ class DevDataBootstrap( finalBossCompleted = false, lastActivityAt = Instant.now().minus(1, ChronoUnit.DAYS), ) - + seedPupilGameProgress( + pupil = pupilSofia, + classroom = sampleClassroom, + totalScore = 0, + totalXp = 0, + currentLevel = 1, + completedStopsCount = 0, + completedTasksCount = 0, + finalBossCompleted = false, + lastActivityAt = Instant.now(), + ) seedRefreshToken(admin, "dev-admin-refresh-token", Instant.now().plus(14, ChronoUnit.DAYS), null) seedRefreshToken( teacher, @@ -139,6 +162,12 @@ class DevDataBootstrap( Instant.now().plus(1, ChronoUnit.DAYS), Instant.now().minus(1, ChronoUnit.HOURS), ) + seedRefreshToken( + pupilSofia, + "dev-pupil-sofia-refresh-token", + Instant.now().plus(7, ChronoUnit.DAYS), + null, + ) mapStopBootstrap.seedAllMapStops() val activeStops = taskBootstrap.seedAllTasks(classroom = sampleClassroom, teacher = teacher) @@ -154,6 +183,9 @@ class DevDataBootstrap( classroom = sampleClassroom, ) + pupilProgressSeedingService.seedIfAbsent(pupil = pupilNoah, classroom = sampleClassroom) + seedAllStopsUnlocked(pupil = pupilSofia, classroom = sampleClassroom, stops = activeStops) + logger.info( "Development bootstrap ensured sample rows for users, profiles, refresh tokens, classroom {} with join code {}, and seeded tasks for {} active map stops", sampleClassroom.title, @@ -419,6 +451,36 @@ class DevDataBootstrap( ) } + private fun seedAllStopsUnlocked( + pupil: User, + classroom: Classroom, + stops: List, + ) { + val pupilId = requireNotNull(pupil.id) { "Pupil seed user must have an id" } + val classroomId = classroom.id + val alreadySeeded = pupilStopProgressRepository + .findAllByIdPupilUserIdAndIdClassroomId(pupilId, classroomId) + .isNotEmpty() + if (alreadySeeded) return + + val records = stops.mapNotNull { stop -> + val stopId = stop.id ?: return@mapNotNull null + PupilStopProgress( + id = PupilStopProgressId( + pupilUserId = pupilId, + classroomId = classroomId, + stopId = stopId, + ), + pupil = pupil, + classroom = classroom, + stop = stop, + ).apply { + status = StopProgressStatus.NOT_STARTED + } + } + pupilStopProgressRepository.saveAll(records) + } + private fun hashToken(rawToken: String): String = HexFormat.of().formatHex( MessageDigest.getInstance("SHA-256").digest(rawToken.toByteArray(StandardCharsets.UTF_8)), diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/tasks/PostkontoretTaskSeeds.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/tasks/PostkontoretTaskSeeds.kt index 92ac4555..ddcfc114 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/tasks/PostkontoretTaskSeeds.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/tasks/PostkontoretTaskSeeds.kt @@ -4,91 +4,264 @@ import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskType internal fun postkontoretTaskSeeds(): List = listOf( - binaryChoiceTask( + emailTask( difficultyLevel = 1, - taskType = TaskType.EMAIL_REVIEW, - title = localized("Postkontoret 1: Se på avsenderen", "Post Office 1: Check the sender"), + title = localized("Postkontoret 1: Du har vunnet!", "Post Office 1: You have won!"), introText = localizedOptional( - "Begynn med å undersøke hvem e-posten egentlig kommer fra.", - "Start by checking who the email actually comes from.", + "Les e-posten og trykk på delene som virker mistenkelige.", + "Read the email and tap the parts that seem suspicious.", ), - promptText = localized( - "Hvilken e-postadresse virker mest troverdig?", - "Which email address seems most trustworthy?", - ), - correctOption = explainedOption( - 1, - "biblioteket@trondheim.kommune.no", - "biblioteket@trondheim.kommune.no", - true, - "Den bruker et kjent navn og et vanlig offentlig domene.", - "It uses a familiar name and a common public domain.", - ), - incorrectOption = explainedOption( - 2, - "trondheim-bibliotek@premie-vinner.ru", - "trondheim-bibliotek@premie-vinner.ru", - false, - "Et merkelig domenenavn er et faresignal.", - "A strange domain name is a warning sign.", + items = listOf( + emailPart( + itemOrder = 1, + emailPart = "sender", + isHotspot = true, + displayText = "Norsk Fotokonkurranse ", + feedbackNb = "Avsenderadressen slutter på @gratis-premie.xyz – ikke et kjent norsk domene. Falske avsendere bruker ofte rare adresser!", + feedbackEn = "The sender address ends in @gratis-premie.xyz – not a known Norwegian domain. Scammers often use strange addresses!", + ), + emailPart( + itemOrder = 2, + emailPart = "subject", + isHotspot = false, + displayText = "DU HAR VUNNET et profesjonelt kamera!!!", + ), + emailPart( + itemOrder = 3, + emailPart = "body", + isHotspot = true, + displayText = "Gratulerer! Du er valgt som vinner av Norges Største Fotokonkurranse. Svar innen 24 timer for å motta premien din på 15 000 kr.", + feedbackNb = "«Svar innen 24 timer» er et vanlig triks for å få deg til å handle raskt uten å tenke.", + feedbackEn = "\"Reply within 24 hours\" is a classic trick to make you act fast without thinking.", + ), + emailPart( + itemOrder = 4, + emailPart = "body", + isHotspot = true, + displayText = "For å motta premien må du oppgi fullt navn, adresse og kontonummer så vi kan overføre pengene.", + feedbackNb = "Ingen seriøs konkurranse trenger kontonummeret ditt for å sende en pakke. Hva ville du gjort?", + feedbackEn = "No real competition needs your bank account number to send a package. What would you do?", + options = listOf( + explainedOption( + 1, + "Fortelle en voksen og slette e-posten.", + "Tell an adult and delete the email.", + true, + "En voksen kan hjelpe deg å dobbeltsjekke uten at du trykker på noe farlig.", + "An adult can help you double-check without clicking anything dangerous.", + ), + explainedOption( + 2, + "Sende kontonummeret – premien ser ekte ut!", + "Send my account number – the prize looks real!", + false, + "Svindlerne håpet du ville gjøre akkurat det.", + "That is exactly what the scammers were hoping for.", + ), + explainedOption( + 3, + "Videresende e-posten til alle i klassen så de også kan vinne.", + "Forward the email to everyone in class so they can win too.", + false, + "Da sprer du svindelen videre – ingen i klassen din vil takke deg for det!", + "That spreads the scam further – none of your classmates will thank you for it!", + ), + explainedOption( + 4, + "Trykke på lenken «bare for å se» hva som skjer.", + "Click the link \"just to see\" what happens.", + false, + "Mistenkelige lenker kan laste ned noe farlig uten at du merker det.", + "Suspicious links can download something harmful without you noticing.", + ), + ), + ), + emailPart( + itemOrder = 5, + emailPart = "body", + isHotspot = true, + displayText = "Klikk her for å bekrefte: www.gratis-premie.xyz/kamera/vinner/bekreft/klikk-her-123", + feedbackNb = "En veldig lang og rotete lenke er et faresignal. Ekte nettsteder har korte, enkle adresser.", + feedbackEn = "A very long and messy link is a warning sign. Real websites have short, simple addresses.", + ), ), ), - binaryChoiceTask( + + emailTask( difficultyLevel = 2, - taskType = TaskType.EMAIL_REVIEW, - title = localized("Postkontoret 2: Oppdag lurespråket", "Post Office 2: Spot the scam language"), + title = localized("Postkontoret 2: IT-avdelingen trenger hjelp", "Post Office 2: IT department needs help"), introText = localizedOptional( - "Svindel vil ofte stresse deg til å handle raskt.", - "Scams often try to stress you into acting quickly.", - ), - promptText = localized( - "Hvilken melding virker mest mistenkelig?", - "Which message seems most suspicious?", + "Denne e-posten ser mer ekte ut. Klarer du å finne faresignalene?", + "This email looks more convincing. Can you spot the warning signs?", ), - correctOption = explainedOption( - 1, - "Klikk NÅ ellers blir kontoen din stengt om 5 minutter!", - "Click NOW or your account will be closed in 5 minutes!", - true, - "Tidspress og store trusler brukes ofte i svindel.", - "Urgency and big threats are often used in scams.", - ), - incorrectOption = explainedOption( - 2, - "Hei! Husk å levere låneboka innen fredag.", - "Hi! Remember to return the library book by Friday.", - false, - "Den virker rolig og konkret.", - "It seems calm and specific.", + items = listOf( + emailPart( + itemOrder = 1, + emailPart = "sender", + isHotspot = true, + displayText = "Skole-IT ", + feedbackNb = "Skolens IT-avdeling bruker skolens eget domene – ikke @skole-hjelp.net. Sjekk alltid om adressen stemmer med organisasjonen.", + feedbackEn = "The school's IT department uses the school's own domain – not @skole-hjelp.net. Always check if the address matches the organisation.", + ), + emailPart( + itemOrder = 2, + emailPart = "subject", + isHotspot = true, + displayText = "VIKTIG: Passordet ditt utløper om 1 time", + feedbackNb = "«1 time» – hastverk igjen! Ekte IT-systemer gir deg alltid god tid.", + feedbackEn = "\"1 hour\" – urgency again! Real IT systems always give you plenty of time.", + ), + emailPart( + itemOrder = 3, + emailPart = "body", + isHotspot = false, + displayText = "Hei! Vi har oppdaget at passordet ditt snart utløper.", + ), + emailPart( + itemOrder = 4, + emailPart = "body", + isHotspot = true, + displayText = "Logg inn med brukernavn og passord her for å fornye tilgangen din umiddelbart.", + feedbackNb = "Ingen IT-avdeling trenger passordet ditt – de kan alltid tilbakestille det selv. Hva ville du gjort?", + feedbackEn = "No IT department ever needs your password – they can always reset it themselves. What would you do?", + options = listOf( + explainedOption( + 1, + "Spørre en lærer om e-posten er ekte før jeg gjør noe.", + "Ask a teacher if the email is real before doing anything.", + true, + "Alltid dobbeltsjekk med en du stoler på før du oppgir passord.", + "Always double-check with someone you trust before giving out passwords.", + ), + explainedOption( + 2, + "Skrive inn passordet – jeg vil ikke miste tilgangen!", + "Enter my password – I do not want to lose access!", + false, + "Det er akkurat frykten svindlerne utnytter.", + "That is exactly the fear the scammers are exploiting.", + ), + explainedOption( + 3, + "Svare med passordet og be dem slutte å sende slike e-poster.", + "Reply with my password and ask them to stop sending these emails.", + false, + "Da har du gitt bort passordet – og svindleren bryr seg ikke om klagen din.", + "You have handed over your password – and the scammer does not care about your complaint.", + ), + ), + ), ), ), - binaryChoiceTask( + + emailTask( difficultyLevel = 3, - taskType = TaskType.EMAIL_REVIEW, - title = localized("Postkontoret 3: Trygg reaksjon", "Post Office 3: Safe reaction"), + title = localized("Postkontoret 3: En trygg e-post", "Post Office 3: A safe email"), introText = localizedOptional( - "Når du er usikker, er det viktig å velge en trygg handling.", - "When you are unsure, it is important to choose a safe action.", - ), - promptText = localized( - "Hva er det tryggeste du kan gjøre når en e-post virker falsk?", - "What is the safest thing to do when an email seems fake?", + "Denne e-posten er faktisk trygg. Finn elementene som viser at den er ekte.", + "This email is actually safe. Find the elements that show it is genuine.", ), - correctOption = explainedOption( - 1, - "Spør en voksen eller kontakt avsenderen gjennom en kjent kanal.", - "Ask an adult or contact the sender through a known channel.", - true, - "Det hjelper deg å sjekke meldingen uten å trykke på noe farlig.", - "That helps you verify the message without clicking anything dangerous.", - ), - incorrectOption = explainedOption( - 2, - "Trykk på lenken for å se om den er ekte.", - "Click the link to see if it is real.", - false, - "Det kan være farlig å teste mistenkelige lenker.", - "It can be risky to test suspicious links.", + items = listOf( + emailPart( + itemOrder = 1, + emailPart = "sender", + isHotspot = true, + isTrustworthy = true, + displayText = "Trondheim bibliotek ", + feedbackNb = "@trondheim.kommune.no er et ekte offentlig domene. Det er mye vanskeligere å forfalske enn .net eller .xyz.", + feedbackEn = "@trondheim.kommune.no is a real public domain. It is much harder to fake than .net or .xyz.", + ), + emailPart( + itemOrder = 2, + emailPart = "subject", + isHotspot = false, + displayText = "Påminnelse: Boken din leveres tilbake innen fredag", + ), + emailPart( + itemOrder = 3, + emailPart = "body", + isHotspot = false, + displayText = "Hei! Dette er en vennlig påminnelse om at boken du lånte, «Internett-mysteriet», må leveres tilbake senest fredag 25. april.", + ), + emailPart( + itemOrder = 4, + emailPart = "body", + isHotspot = true, + isTrustworthy = true, + displayText = "Du trenger ikke gjøre noe – bare lever boken i skranken. Har du spørsmål, ring oss på 73 87 30 00.", + feedbackNb = "Meldingen er rolig, konkret og ber deg ikke om passord eller penger. Hva gjør deg mest trygg på en e-post?", + feedbackEn = "The message is calm, specific, and does not ask for a password or money. What makes you most confident an email is genuine?", + options = listOf( + explainedOption( + 1, + "Kjent avsenderdomene, rolig språk og ingen forespørsel om personlig informasjon.", + "Familiar sender domain, calm language, and no request for personal information.", + true, + "Disse tre tingene til sammen er de sterkeste signalene på en trygg e-post.", + "These three things together are the strongest signs of a safe email.", + ), + explainedOption( + 2, + "At e-posten har en fin logo og ser profesjonell ut.", + "That the email has a nice logo and looks professional.", + false, + "Logoer og design kan kopieres av hvem som helst.", + "Logos and design can be copied by anyone.", + ), + explainedOption( + 3, + "At jeg har fått e-post fra dem før.", + "That I have received email from them before.", + false, + "Svindlere kan forfalske kjente avsendernavn – domenet er viktigere.", + "Scammers can fake familiar sender names – the domain is what matters.", + ), + ), + ), ), ), ) + +// ── Email-specific builders ────────────────────────────────────────────────── + +private fun emailTask( + difficultyLevel: Int, + title: LocalizedText, + introText: LocalizedOptionalText?, + items: List, +): SeedTask = + SeedTask( + difficultyLevel = difficultyLevel, + taskType = TaskType.EMAIL_REVIEW, + title = title, + introText = introText, + items = items, + ) + +private fun emailPart( + itemOrder: Int, + emailPart: String, + isHotspot: Boolean, + displayText: String, + isTrustworthy: Boolean = false, + feedbackNb: String = "", + feedbackEn: String = "", + options: List = emptyList(), +): SeedItem { + val hasActionQuestion = options.isNotEmpty() + val meta = buildString { + append("""{"emailPart":"$emailPart","isHotspot":$isHotspot,"displayText":${jsonString(displayText)}""") + if (isTrustworthy) append(""","isTrustworthy":true""") + if (hasActionQuestion) append(""","hasActionQuestion":true""") + append("}") + } + return SeedItem( + itemOrder = itemOrder, + promptText = localized(feedbackNb, feedbackEn), + metadataJson = meta, + options = options, + ) +} + +private fun jsonString(value: String): String = + "\"${value.replace("\\", "\\\\").replace("\"", "\\\"")}\"" \ No newline at end of file From 55061c9d6369d411852cddc1554d8dc5c885e222 Mon Sep 17 00:00:00 2001 From: kristoffer Date: Thu, 23 Apr 2026 10:34:37 +0200 Subject: [PATCH 2/2] fixed so that taskOptions will filter on only the ones with an answer when submitting stop --- .../idatt/backend/game/tasks/application/TaskService.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 d0afbd8b..5685252d 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 @@ -492,7 +492,7 @@ class TaskService( throw ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, "Published tasks must include at least one item") } - task.items.forEach { item -> + task.items.filter { it.options.isNotEmpty() }.forEach { item -> if (item.options.size < 2) { throw ResponseStatusException( HttpStatus.UNPROCESSABLE_ENTITY, @@ -528,12 +528,13 @@ class TaskService( ) } - val baseItemScore = if (task.items.isEmpty()) 0 else task.maxScore / task.items.size + val answerableItems = task.items.filter { it.options.isNotEmpty() } + val baseItemScore = if (answerableItems.isEmpty()) 0 else task.maxScore / answerableItems.size var score = 0 val feedback = mutableListOf() var allAnswersCorrect = true - task.items.forEach { item -> + answerableItems.forEach { item -> val itemId = requireNotNull(item.id) val itemAnswer = answerByItemId[itemId] ?: throw ResponseStatusException(