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 99f85614..8bbf256e 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 @@ -205,33 +205,33 @@ class DevDataBootstrap( joinCode = "CLASS21A", ) - seedClassroomMembership(sampleClassroom, pupilAda, "Ada") - seedClassroomMembership(sampleClassroom, pupilNoah, "Noah") - seedClassroomMembership(sampleClassroom, pupilSofia, "Sofia") - seedClassroomMembership(sampleClassroom, pupilSara, "Sara") - seedClassroomMembership(sampleClassroom, pupilLiam, "Liam") - seedClassroomMembership(sampleClassroom, pupilEmma, "Emma") - seedClassroomMembership(sampleClassroom, pupilOliver, "Oliver") - seedClassroomMembership(sampleClassroom, pupilMaja, "Maja") - seedClassroomMembership(sampleClassroom, pupilJakob, "Jakob") - seedClassroomMembership(secondClassroom, pupilChristina, "Christina") - seedClassroomMembership(secondClassroom, pupilSebastian, "Sebastian") - seedClassroomMembership(secondClassroom, pupilPedro, "Pedro") - seedClassroomMembership(secondClassroom, pupilCaroline, "Caroline") - seedClassroomMembership(secondClassroom, pupilMarkus, "Markus") - seedClassroomMembership(secondClassroom, pupilNora, "Nora") - seedClassroomMembership(secondClassroom, pupilTobias, "Tobias") - seedClassroomMembership(secondClassroom, pupilSigrid, "Sigrid") - seedClassroomMembership(secondClassroom, pupilHenrik, "Henrik") - seedClassroomMembership(thirdClassroom, pupilKristoffer, "Kristoffer") - seedClassroomMembership(thirdClassroom, pupilPeder, "Peder") - seedClassroomMembership(thirdClassroom, pupilPablo, "Pablo") - seedClassroomMembership(thirdClassroom, pupilPetra, "Petra") - seedClassroomMembership(thirdClassroom, pupilLars, "Lars") - seedClassroomMembership(thirdClassroom, pupilIngrid, "Ingrid") - seedClassroomMembership(thirdClassroom, pupilMagnus, "Magnus") - seedClassroomMembership(thirdClassroom, pupilAstrid, "Astrid") - seedClassroomMembership(thirdClassroom, pupilEirik, "Eirik") + seedClassroomMembership(sampleClassroom, pupilAda) + seedClassroomMembership(sampleClassroom, pupilNoah) + seedClassroomMembership(sampleClassroom, pupilSofia) + seedClassroomMembership(sampleClassroom, pupilSara) + seedClassroomMembership(sampleClassroom, pupilLiam) + seedClassroomMembership(sampleClassroom, pupilEmma) + seedClassroomMembership(sampleClassroom, pupilOliver) + seedClassroomMembership(sampleClassroom, pupilMaja) + seedClassroomMembership(sampleClassroom, pupilJakob) + seedClassroomMembership(secondClassroom, pupilChristina) + seedClassroomMembership(secondClassroom, pupilSebastian) + seedClassroomMembership(secondClassroom, pupilPedro) + seedClassroomMembership(secondClassroom, pupilCaroline) + seedClassroomMembership(secondClassroom, pupilMarkus) + seedClassroomMembership(secondClassroom, pupilNora) + seedClassroomMembership(secondClassroom, pupilTobias) + seedClassroomMembership(secondClassroom, pupilSigrid) + seedClassroomMembership(secondClassroom, pupilHenrik) + seedClassroomMembership(thirdClassroom, pupilKristoffer) + seedClassroomMembership(thirdClassroom, pupilPeder) + seedClassroomMembership(thirdClassroom, pupilPablo) + seedClassroomMembership(thirdClassroom, pupilPetra) + seedClassroomMembership(thirdClassroom, pupilLars) + seedClassroomMembership(thirdClassroom, pupilIngrid) + seedClassroomMembership(thirdClassroom, pupilMagnus) + seedClassroomMembership(thirdClassroom, pupilAstrid) + seedClassroomMembership(thirdClassroom, pupilEirik) seedPupilProfile(pupilAda, "Ada", sampleClassroom) seedPupilProfile(pupilNoah, "Noah", sampleClassroom) @@ -624,7 +624,6 @@ class DevDataBootstrap( private fun seedClassroomMembership( classroom: Classroom, pupil: User, - nicknameInClass: String, ) { val pupilUserId = requireNotNull(pupil.id) { "Pupil seed user must have an id" } val membership = @@ -632,7 +631,6 @@ class DevDataBootstrap( classroom.addPupilMembership(pupil) classroom.pupilMemberships.first { it.id.pupilUserId == pupilUserId } } - membership.nicknameInClass = nicknameInClass membership.status = ClassroomPupilStatus.ACTIVE membership.approvedAt = membership.approvedAt ?: Instant.now() diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilMembership.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilMembership.kt index 9e7c6bf3..22a95775 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilMembership.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/domain/ClassroomPupilMembership.kt @@ -26,8 +26,6 @@ class ClassroomPupilMembership( @MapsId("pupilUserId") @JoinColumn(name = "pupil_user_id", nullable = false) var pupil: User? = null, - @Column(name = "nickname_in_class", length = 100) - var nicknameInClass: String? = null, @Enumerated(EnumType.STRING) @Column(name = "status", nullable = false) var status: ClassroomPupilStatus = ClassroomPupilStatus.PENDING, diff --git a/src/main/resources/db/migration/V27__drop_nickname_in_class_from_classroom_pupils.sql b/src/main/resources/db/migration/V27__drop_nickname_in_class_from_classroom_pupils.sql new file mode 100644 index 00000000..60e98d23 --- /dev/null +++ b/src/main/resources/db/migration/V27__drop_nickname_in_class_from_classroom_pupils.sql @@ -0,0 +1,2 @@ +ALTER TABLE classroom_pupils + DROP COLUMN nickname_in_class;