Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class DevDataBootstrap(
private val mapStopBootstrap: MapStopBootstrap,
private val medalBootstrap: MedalBootstrap,
private val taskBootstrap: TaskBootstrap,
private val xpBootstrap: XpBootstrap,
private val pupilProgressSeedingService: PupilProgressSeedingService,
private val pupilStopProgressRepository: PupilStopProgressRepository,
) : ApplicationRunner {
Expand Down Expand Up @@ -172,6 +173,12 @@ class DevDataBootstrap(

mapStopBootstrap.seedAllMapStops()
medalBootstrap.seedAllMedals()
xpBootstrap.seedAllXpEvents()
xpBootstrap.seedPupilXpEvent(pupilAda)
xpBootstrap.seedPupilXpEvent(pupilAda)
xpBootstrap.seedPupilXpEvent(pupilAda)
xpBootstrap.seedPupilXpEvent(pupilAda)
xpBootstrap.seedPupilXpEvent(pupilAda)
val activeStops = taskBootstrap.seedAllTasks(classroom = sampleClassroom, teacher = teacher)
seedNotebookEntries(
classroom = sampleClassroom,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package edu.ntnu.idi.idatt.backend.bootstrap

import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository
import edu.ntnu.idi.idatt.backend.game.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.game.medals.domain.MedalType
import edu.ntnu.idi.idatt.backend.game.medals.repository.MedalRepository
import edu.ntnu.idi.idatt.backend.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.medals.domain.MedalType
import edu.ntnu.idi.idatt.backend.medals.repository.MedalRepository
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
import org.springframework.stereotype.Component

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package edu.ntnu.idi.idatt.backend.bootstrap

import edu.ntnu.idi.idatt.backend.xp.domain.PupilXpEvent
import edu.ntnu.idi.idatt.backend.xp.domain.PupilXpEventId
import edu.ntnu.idi.idatt.backend.xp.domain.XpEvent
import edu.ntnu.idi.idatt.backend.xp.domain.XpEventCode
import edu.ntnu.idi.idatt.backend.xp.infrastructure.PupilXpEventRepository
import edu.ntnu.idi.idatt.backend.xp.infrastructure.XpEventRepository
import edu.ntnu.idi.idatt.backend.iam.domain.User
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
import org.springframework.stereotype.Component

@Component
@ConditionalOnProperty(name = ["app.bootstrap.enabled"], havingValue = "true")
class XpBootstrap(
private val xpEventRepository: XpEventRepository,
private val pupilXpEventRepository: PupilXpEventRepository,
) {
fun seedAllXpEvents() {
if (xpEventRepository.findByCode(XpEventCode.STOP_COMPLETED) != null) {
return
}

xpEventRepository.save(
XpEvent(
code = XpEventCode.STOP_COMPLETED,
title = "Stopp fullfort",
xpScore = 75,
repeatable = true,
),
)

xpEventRepository.save(
XpEvent(
code = XpEventCode.MEDAL_AWARDED,
title = "Medalje låst opp",
xpScore = 75,
repeatable = true,
),
)

xpEventRepository.save(
XpEvent(
code = XpEventCode.NOTEBOOK_ENTRY_CREATED,
title = "La inn notat",
xpScore = 10,
repeatable = true,
),
)

xpEventRepository.save(
XpEvent(
code = XpEventCode.UPDATE_AVATAR,
title = "Oppdatert avatar for første gang",
xpScore = 25,
repeatable = false,
),
)
}

fun seedPupilXpEvent(pupil: User) {
val pupilId = requireNotNull(pupil.id) { "Seeded pupil must have an id" }
val xpEvent = xpEventRepository.findByCode(XpEventCode.STOP_COMPLETED)
?: throw IllegalStateException("XP event ${XpEventCode.STOP_COMPLETED} must be seeded before pupil XP rows")
val xpEventId = requireNotNull(xpEvent.id) { "Seeded XP event must have an id" }

val existingPupilXpEvent = pupilXpEventRepository.findByIdPupilUserIdAndIdXpEventId(pupilId, xpEventId)
if (existingPupilXpEvent != null) {
existingPupilXpEvent.completionCount += 1
pupilXpEventRepository.save(existingPupilXpEvent)
return
}

pupilXpEventRepository.save(
PupilXpEvent(
id = PupilXpEventId(
pupilUserId = pupilId,
xpEventId = xpEventId,
),
pupil = pupil,
xpEvent = xpEvent,
completionCount = 1,
),
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class PupilStopProgressController(
): StopProgressResponse {
currentUserResolver.requirePupil(currentUser.subject)
return progressService
.updateProgress(pupilUserId, classroomId, stopId, request.toCommand())
.updateProgress(currentUser, classroomId, stopId, request.toCommand())
.toStopProgressResponse()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgress
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.application.CurrentUserResolver
import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser
import edu.ntnu.idi.idatt.backend.xp.application.XpService
import edu.ntnu.idi.idatt.backend.xp.domain.XpEventCode
import edu.ntnu.idi.idatt.backend.shared.events.DomainEventPublisher
import edu.ntnu.idi.idatt.backend.shared.events.MapStopCompletedEvent
import edu.ntnu.idi.idatt.backend.shared.events.PupilGameCompletedEvent
Expand All @@ -21,15 +25,16 @@ import java.time.Instant
*
* @property progressRepository JPA repository for pupil stop progress records
* @property mapStopRepository Repository for map stop definitions
* @property medalService Service for awarding medals upon stop completion
* @property userRepository Repository for user lookup
* @property classroomRepository Repository for classroom lookup
* @property currentUserResolver resolver for the authenticated pupil user
* @property domainEventPublisher publisher for stop progression domain events
*/
@Service
class PupilStopProgressService(
private val progressRepository: PupilStopProgressRepository,
private val mapStopRepository: MapStopsRepository,
private val currentUserResolver: CurrentUserResolver,
private val domainEventPublisher: DomainEventPublisher,
private val xpService: XpService,
) {
/**
* Returns all stop progress records for a pupil in a classroom.
Expand Down Expand Up @@ -68,7 +73,7 @@ class PupilStopProgressService(
* is higher. If the stop is transitioned to [StopProgressStatus.COMPLETED], the next active
* stop is automatically unlocked by transitioning it to [StopProgressStatus.NOT_STARTED].
*
* @param pupilUserId pupil whose progress to update
* @param currentUser authenticated pupil whose progress to update
* @param classroomId classroom to scope the update to
* @param stopId map stop to update progress for
* @param command update payload containing the fields to mutate
Expand All @@ -79,11 +84,13 @@ class PupilStopProgressService(
*/
@Transactional
fun updateProgress(
pupilUserId: Long,
currentUser: CurrentUser,
classroomId: Long,
stopId: Long,
command: UpdateStopProgressCommand,
): PupilStopProgress {
val pupil = currentUserResolver.requirePupil(currentUser.subject)
val pupilUserId = requireNotNull(pupil.id) { "Authenticated pupil is missing an id" }
val progress = getProgressForStop(pupilUserId, classroomId, stopId)
val activeStops = mapStopRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()

Expand All @@ -102,6 +109,7 @@ class PupilStopProgressService(
progress.completedAt = Instant.now()
unlockNextStop(pupilUserId, classroomId, stopId, activeStops)
publishCompletionEvents(pupilUserId, classroomId, stopId, progress)
xpService.awardXpEvent(currentUser, XpEventCode.STOP_COMPLETED)
}
}
if (progress.status != StopProgressStatus.COMPLETED) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TaskController(
@RequestBody @Valid request: SubmitStopAnswersRequest,
@AuthenticationPrincipal currentUser: CurrentUser,
): StopSubmissionResponse =
taskService.submitStopAnswers(request.toCommand(classroomId, currentUser.subject)).toResponse()
taskService.submitStopAnswers(request.toCommand(classroomId, currentUser)).toResponse()

/**
* Creates a new draft task owned by the classroom's teacher.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ private fun LocalizedOptionalTextRequest.toLocalizedOptionalText(): LocalizedOpt

fun SubmitStopAnswersRequest.toCommand(
classroomId: Long,
authenticatedSubject: String,
currentUser: CurrentUser,
) = edu.ntnu.idi.idatt.backend.game.tasks.application.SubmitStopAnswersCommand(
authenticatedSubject = authenticatedSubject,
currentUser = currentUser,
classroomId = classroomId,
stopId = stopId,
taskAnswers = taskAnswers.map { taskAnswer ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package edu.ntnu.idi.idatt.backend.game.tasks.application

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.iam.security.CurrentUser
import java.time.Instant

/**
Expand Down Expand Up @@ -147,7 +148,7 @@ data class TaskSummary(
* Command used to submit answers for all tasks at a given stop.
*/
data class SubmitStopAnswersCommand(
val authenticatedSubject: String,
val currentUser: CurrentUser,
val classroomId: Long,
val stopId: Long,
val taskAnswers: List<SubmitTaskAnswerCommand>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class TaskService(
*/
@Transactional
fun submitStopAnswers(command: SubmitStopAnswersCommand): StopSubmissionResult {
val (_, user) = requireParticipatingClassroom(command.authenticatedSubject, command.classroomId)
val (_, user) = requireParticipatingClassroom(command.currentUser.subject, command.classroomId)
if (user.role != UserRole.PUPIL) {
throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only pupils may submit stop answers")
}
Expand Down Expand Up @@ -271,7 +271,7 @@ class TaskService(
val totalMaxScore = tasks.sumOf { it.maxScore }
val passed = taskResults.all { it.passed }
val updatedProgress = updateProgressAfterSubmission(
pupilId = pupilId,
currentUser = command.currentUser,
classroomId = command.classroomId,
stopId = command.stopId,
currentStatus = progress.status,
Expand Down Expand Up @@ -577,7 +577,7 @@ class TaskService(
}

private fun updateProgressAfterSubmission(
pupilId: Long,
currentUser: CurrentUser,
classroomId: Long,
stopId: Long,
currentStatus: StopProgressStatus,
Expand All @@ -588,7 +588,7 @@ class TaskService(
when {
passed && currentStatus == StopProgressStatus.NOT_STARTED -> {
pupilStopProgressService.updateProgress(
pupilId,
currentUser,
classroomId,
stopId,
UpdateStopProgressCommand(
Expand All @@ -599,7 +599,7 @@ class TaskService(
),
)
pupilStopProgressService.updateProgress(
pupilId,
currentUser,
classroomId,
stopId,
UpdateStopProgressCommand(
Expand All @@ -612,7 +612,7 @@ class TaskService(
}

passed && currentStatus == StopProgressStatus.IN_PROGRESS -> pupilStopProgressService.updateProgress(
pupilId,
currentUser,
classroomId,
stopId,
UpdateStopProgressCommand(
Expand All @@ -624,7 +624,7 @@ class TaskService(
)

passed -> pupilStopProgressService.updateProgress(
pupilId,
currentUser,
classroomId,
stopId,
UpdateStopProgressCommand(
Expand All @@ -636,7 +636,7 @@ class TaskService(
)

currentStatus == StopProgressStatus.NOT_STARTED -> pupilStopProgressService.updateProgress(
pupilId,
currentUser,
classroomId,
stopId,
UpdateStopProgressCommand(
Expand All @@ -648,7 +648,7 @@ class TaskService(
)

else -> pupilStopProgressService.updateProgress(
pupilId,
currentUser,
classroomId,
stopId,
UpdateStopProgressCommand(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package edu.ntnu.idi.idatt.backend.game.medals.api
package edu.ntnu.idi.idatt.backend.medals.api

import edu.ntnu.idi.idatt.backend.game.medals.application.MedalService
import edu.ntnu.idi.idatt.backend.game.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.game.medals.domain.PupilMedal
import edu.ntnu.idi.idatt.backend.medals.application.MedalService
import edu.ntnu.idi.idatt.backend.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.medals.domain.PupilMedal
import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver
import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser
import org.springframework.http.HttpStatus
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package edu.ntnu.idi.idatt.backend.game.medals.application
package edu.ntnu.idi.idatt.backend.medals.application

import edu.ntnu.idi.idatt.backend.game.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.game.medals.domain.PupilMedal
import edu.ntnu.idi.idatt.backend.game.medals.repository.MedalRepository
import edu.ntnu.idi.idatt.backend.game.medals.repository.PupilMedalRepository
import edu.ntnu.idi.idatt.backend.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.medals.domain.PupilMedal
import edu.ntnu.idi.idatt.backend.medals.repository.MedalRepository
import edu.ntnu.idi.idatt.backend.medals.repository.PupilMedalRepository
import edu.ntnu.idi.idatt.backend.iam.domain.User
import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser
import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom
import edu.ntnu.idi.idatt.backend.xp.application.XpService
import edu.ntnu.idi.idatt.backend.xp.domain.XpEventCode
import org.springframework.dao.DataIntegrityViolationException
import org.springframework.stereotype.Service
import org.springframework.transaction.PlatformTransactionManager
Expand All @@ -24,6 +27,7 @@ import java.util.stream.Collectors
class MedalService(
private val medalRepository: MedalRepository,
private val pupilMedalRepository: PupilMedalRepository,
private val xpService: XpService,
transactionManager: PlatformTransactionManager,
) {
private val awardTransaction = TransactionTemplate(transactionManager).apply {
Expand Down Expand Up @@ -80,7 +84,16 @@ class MedalService(
pupil = pupil,
classroom = classroom,
medal = medal,
)
),
)
xpService.awardXpEvent(
CurrentUser(
subject = pupilId.toString(),
portalType = "pupil",
email = null,
authorities = setOf("ROLE_PUPIL"),
),
XpEventCode.MEDAL_AWARDED,
)
}
} catch (exception: DataIntegrityViolationException) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.ntnu.idi.idatt.backend.game.medals.domain
package edu.ntnu.idi.idatt.backend.medals.domain

import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop
import jakarta.persistence.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.ntnu.idi.idatt.backend.game.medals.domain
package edu.ntnu.idi.idatt.backend.medals.domain

enum class MedalType {
STOP_COMPLETION,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.ntnu.idi.idatt.backend.game.medals.domain
package edu.ntnu.idi.idatt.backend.medals.domain

import edu.ntnu.idi.idatt.backend.iam.domain.User
import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.ntnu.idi.idatt.backend.game.medals.repository
package edu.ntnu.idi.idatt.backend.medals.repository

import edu.ntnu.idi.idatt.backend.game.medals.domain.Medal
import edu.ntnu.idi.idatt.backend.medals.domain.Medal
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository

Expand Down
Loading