From 00491eec0990b3f738fbccfb5213256ebfcaac19 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Wed, 22 Apr 2026 09:33:03 +0200 Subject: [PATCH] Correct method naming and clean up code formatting --- .../ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt | 2 +- .../backend/game/gameProgress/domain/PupilGameProgress.kt | 4 ++-- .../infrastructure/PupilGameProgressRepository.kt | 2 +- .../backend/game/mapstops/application/MapStopService.kt | 3 +-- .../application/PupilProgressSeedingEventListener.kt | 2 +- .../ntnu/idi/idatt/backend/game/mapstops/domain/MapStop.kt | 4 +--- .../idatt/backend/game/mapstops/domain/PupilStopProgress.kt | 6 +++--- .../edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt | 1 - .../edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt | 2 -- 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/bootstrap/DevDataBootstrap.kt index 97186f9e..77659d4c 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 @@ -256,7 +256,7 @@ class DevDataBootstrap( ) { val pupilUserId = requireNotNull(pupil.id) { "Pupil seed user must have an id" } val classroomId = classroom.id - val existingProgress = pupilGameProgressRepository.findByPupilIdAndClassroom_Id(pupilUserId, classroomId) + val existingProgress = pupilGameProgressRepository.findByPupilIdAndClassroomId(pupilUserId, classroomId) if (existingProgress != null) { existingProgress.updateProgress( totalScore = totalScore, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/domain/PupilGameProgress.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/domain/PupilGameProgress.kt index d3a1e3aa..e47a4882 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/domain/PupilGameProgress.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/domain/PupilGameProgress.kt @@ -81,7 +81,7 @@ class PupilGameProgress( @Embeddable data class PupilGameProgressId( @Column(name = "pupil_user_id") - val pupilUserId: Long = 0, + var pupilUserId: Long = 0, @Column(name = "classroom_id") - val classroomId: Long = 0, + var classroomId: Long = 0, ) : Serializable diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/infrastructure/PupilGameProgressRepository.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/infrastructure/PupilGameProgressRepository.kt index 91f37f49..b5089e7f 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/infrastructure/PupilGameProgressRepository.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/gameProgress/infrastructure/PupilGameProgressRepository.kt @@ -15,7 +15,7 @@ interface PupilGameProgressRepository : JpaRepository stop.toOpenOverviewEntry() } + return stops.map { stop -> stop.toOpenOverviewEntry() } } val progressByStopId = pupilStopProgressRepository .findAllByIdPupilUserIdAndIdClassroomId(accessContext.pupilUserId, classroomId) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilProgressSeedingEventListener.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilProgressSeedingEventListener.kt index 97a7e19c..ff736518 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilProgressSeedingEventListener.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/PupilProgressSeedingEventListener.kt @@ -20,7 +20,7 @@ class PupilProgressSeedingEventListener( */ @EventListener fun onPupilJoined(event: PupilJoinedClassroomEvent) { - val pupilId = requireNotNull(event.pupil.id) { "Pupil is missing an id" } + requireNotNull(event.pupil.id) { "Pupil is missing an id" } pupilProgressSeedingService.seedIfAbsent( pupil = event.pupil, classroom = event.classroom, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/MapStop.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/MapStop.kt index 1c57682a..e9292b77 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/MapStop.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/MapStop.kt @@ -45,6 +45,4 @@ class MapStop ( var isFinalBoss: Boolean? = false, @Column(name = "is_active") var isActive: Boolean? = false, -) { - -} \ No newline at end of file +) \ No newline at end of file diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/PupilStopProgress.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/PupilStopProgress.kt index 5e0bb140..d15f7cee 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/PupilStopProgress.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/domain/PupilStopProgress.kt @@ -74,9 +74,9 @@ enum class StopProgressStatus { @Embeddable data class PupilStopProgressId( @Column(name = "pupil_user_id") - val pupilUserId: Long?, + var pupilUserId: Long?, @Column(name = "classroom_id") - val classroomId: Long, + var classroomId: Long, @Column(name = "stop_id") - val stopId: Long, + var stopId: Long, ) : Serializable \ No newline at end of file diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt index 674d4382..06f04ce1 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt @@ -14,7 +14,6 @@ import org.springframework.http.ResponseCookie import org.springframework.http.ResponseEntity import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.web.csrf.CsrfTokenRepository -import org.springframework.web.bind.annotation.DeleteMapping import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PutMapping diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt index 9d011c0b..42117fff 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt @@ -1,8 +1,6 @@ package edu.ntnu.idi.idatt.backend.iam.domain import jakarta.persistence.Column import jakarta.persistence.Entity -import jakarta.persistence.EnumType -import jakarta.persistence.Enumerated import jakarta.persistence.FetchType import jakarta.persistence.GeneratedValue import jakarta.persistence.GenerationType