fix(frontend): updates for the upcoming semester

sotterbeck · sotterbeck · commit 75d92c8d7e80 · 2025-03-09T21:59:10.000+01:00
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/Configuration.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/Configuration.kt
@@ -55,14 +55,14 @@ class Configuration {
 
     @Bean
     fun evaHtmlCache(): Cache<String, String> {
-        return cacheBuilder<String, String>() {
+        return cacheBuilder<String, String> {
             expireAfterWrite = 1.hours
         }.build()
     }
 
     @Bean
     fun timeTableCache(): Cache<String, ByteArray> {
-        return cacheBuilder<String, ByteArray>() {
+        return cacheBuilder<String, ByteArray> {
             expireAfterWrite = 24.hours
         }.build()
     }
@@ -85,12 +85,12 @@ class Configuration {
     }
 
     @Bean
-    fun parsingFactory(): TeachingEventParsingFactory {
-        return DefaultTeachingEventParsingFactory()
+    fun parsingFactory(teachingEventIdGenerator: TeachingEventKeyGenerator): TeachingEventParsingFactory {
+        return DefaultTeachingEventParsingFactory(teachingEventIdGenerator)
     }
 
     @Bean
-    fun teachingEventIdGenerator(parsingFactory: TeachingEventParsingFactory): TeachingEventKeyGenerator {
+    fun teachingEventIdGenerator(): TeachingEventKeyGenerator {
         return when (idGeneratorType) {
             "combined" -> CombinedTeachingEventKeyGenerator()
             "hash" -> HashTeachingEventKeyGenerator(idGeneratorAlgorithm)
@@ -104,11 +104,8 @@ class Configuration {
     }
 
     @Bean
-    fun teachingEventPresenter(
-        parsingFactory: TeachingEventParsingFactory,
-        teachingEventIdGenerator: TeachingEventKeyGenerator
-    ): TeachingEventPresenter {
-        return TeachingEventPresenterImpl(parsingFactory, teachingEventIdGenerator)
+    fun teachingEventPresenter(parsingFactory: TeachingEventParsingFactory): TeachingEventPresenter {
+        return TeachingEventPresenterImpl(parsingFactory)
     }
 
     @Bean
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventDto.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventDto.kt
@@ -5,6 +5,7 @@ import java.time.LocalDate
 import java.time.LocalTime
 
 data class TeachingEventDto(
+    val id: String,
     val semester: String,
     val day: DayOfWeek,
     val startTime: LocalTime,
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventPresenterImpl.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventPresenterImpl.kt
@@ -1,7 +1,6 @@
 package de.sotterbeck.hbrscalcreator.teachingEvent
 
 import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventResponse.EventModel
-import de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator.TeachingEventKeyGenerator
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.EventType
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventParsingFactory
 import org.springframework.http.HttpStatus
@@ -11,7 +10,6 @@ import java.util.*
 
 class TeachingEventPresenterImpl(
     parsingFactory: TeachingEventParsingFactory,
-    private val keyGenerator: TeachingEventKeyGenerator
 ) : TeachingEventPresenter {
 
     private val moduleParser = parsingFactory.createModuleParser()
@@ -35,10 +33,8 @@ class TeachingEventPresenterImpl(
         val group = groupParser.parse(event.eventTitle).ifBlank { null }
         val module = moduleParser.parse(event.eventTitle)
 
-        val id = keyGenerator.generateKey(teachingEvent = event)
-
         return EventModel(
-            id = id,
+            id = event.id,
             semester = event.semester,
             title = event.eventTitle,
             module = module,
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventRepositoryImpl.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventRepositoryImpl.kt
@@ -2,7 +2,6 @@ package de.sotterbeck.hbrscalcreator.teachingEvent
 
 import de.sotterbeck.hbrscalcreator.eva.EvaInfoRepository
 import de.sotterbeck.hbrscalcreator.reader.TimeTableReader
-import de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator.TeachingEventKeyGenerator
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventMapper
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -13,7 +12,6 @@ import org.springframework.stereotype.Repository
 class TeachingEventRepositoryImpl(
     private val reader: TimeTableReader,
     private val mapper: TeachingEventMapper,
-    private val idGenerator: TeachingEventKeyGenerator,
     private val evaInfoRepository: EvaInfoRepository
 ) : TeachingEventRepository {
 
@@ -36,7 +34,7 @@ class TeachingEventRepositoryImpl(
         val semesterIds = evaInfoRepository.findAllSemesters().map { it.evaId }
         val teachingEvents = findAllTeachingEvents(semesterIds)
 
-        return teachingEvents.find { idGenerator.generateKey(it) == id }
+        return teachingEvents.find { it.id == id }
     }
 
 }
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/CombinedTeachingEventKeyGenerator.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/CombinedTeachingEventKeyGenerator.kt
@@ -1,26 +1,14 @@
 package de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator
 
-import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto
-import java.time.format.TextStyle
 import java.util.*
 
 class CombinedTeachingEventKeyGenerator : TeachingEventKeyGenerator {
 
-    override fun generateKey(teachingEvent: TeachingEventDto): String {
-        val segments = listOf(
-            teachingEvent.semester.replace(" ", ""),
-            teachingEvent.eventTitle.pascalCased().withoutUmlauts().withoutSpecialChars(),
-            teachingEvent.instructor.pascalCased().withoutUmlauts().withoutSpecialChars(),
-            teachingEvent.day.getDisplayName(TextStyle.SHORT, Locale.GERMAN).replace(".", ""),
-            teachingEvent.startTime.toString().withoutSpecialChars(),
-            teachingEvent.endTime.toString().withoutSpecialChars(),
-        )
-        return segments.joinToString(separator = "-").replace("Ü", "U")
-    }
-
-    private fun String.pascalCased(): String {
-        return this.split(" ").joinToString("") {
-            it.replaceFirstChar { char -> char.uppercase() }
+    override fun generateKey(teachingEvent: Map<String, String>): String {
+        return teachingEvent.entries.joinToString(separator = "-") {
+            it.value.withoutUmlauts()
+                .withoutSpecialChars()
+                .lowercase(Locale.getDefault())
         }
     }
 
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/HashTeachingEventKeyGenerator.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/HashTeachingEventKeyGenerator.kt
@@ -1,11 +1,10 @@
 package de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator
 
-import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto
 import java.security.MessageDigest
 
 class HashTeachingEventKeyGenerator(private val algorithm: String) : TeachingEventKeyGenerator {
 
-    override fun generateKey(teachingEvent: TeachingEventDto): String {
+    override fun generateKey(teachingEvent: Map<String, String>): String {
         val teachingEventString = teachingEvent.toString()
 
         return teachingEventString.hashed(algorithm)
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/TeachingEventKeyGenerator.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/TeachingEventKeyGenerator.kt
@@ -1,9 +1,7 @@
 package de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator
 
-import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto
-
 interface TeachingEventKeyGenerator {
 
-    fun generateKey(teachingEvent: TeachingEventDto): String
+    fun generateKey(teachingEvent: Map<String, String>): String
 
 }
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/TeachingEventMapper.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/TeachingEventMapper.kt
@@ -3,7 +3,7 @@ package de.sotterbeck.hbrscalcreator.teachingEvent.parsing
 import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto
 
 /**
- * Maps a teaching event from the raw data to a DTO.
+ * Maps a teaching event from the raw data to a DTO and assigns a unique ID.
  * It only does the mapping, no validation or formatting.
  *
  * Formatting is the responsibility of the [TeachingEventPresenter].
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/impl/DefaultTeachingEventMapper.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/impl/DefaultTeachingEventMapper.kt
@@ -1,6 +1,7 @@
 package de.sotterbeck.hbrscalcreator.teachingEvent.parsing.impl
 
 import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto
+import de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator.TeachingEventKeyGenerator
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventMapper
 import java.time.DayOfWeek
 import java.time.LocalDate
@@ -13,7 +14,7 @@ import java.util.*
  *
  * This implementation assumes that the input map contains the following keys: day, startTime, endTime, room, event, period, instructor
  */
-object DefaultTeachingEventMapper : TeachingEventMapper {
+class DefaultTeachingEventMapper(private val keyGenerator: TeachingEventKeyGenerator) : TeachingEventMapper {
 
     private val weekDayFormatter = DateTimeFormatter.ofPattern("E", Locale.GERMAN)
     private val timeFormatter = DateTimeFormatter.ofPattern("H:mm")
@@ -31,6 +32,7 @@ object DefaultTeachingEventMapper : TeachingEventMapper {
         val endDateString = datePeriod.substringAfter("-").trim()
 
         return TeachingEventDto(
+            id = keyGenerator.generateKey(teachingEvent),
             semester = semesterName,
             day = DayOfWeek.from(day),
             startTime = LocalTime.parse(teachingEvent["startTime"] ?: error("Start time is missing"), timeFormatter),
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/impl/DefaultTeachingEventParsingFactory.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/impl/DefaultTeachingEventParsingFactory.kt
@@ -1,5 +1,6 @@
 package de.sotterbeck.hbrscalcreator.teachingEvent.parsing.impl
 
+import de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator.TeachingEventKeyGenerator
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.EventPropertyParser
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventMapper
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventParsingFactory
@@ -12,7 +13,8 @@ import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TypeProvider
  *
  * To extend support for other terms, implement a new [TeachingEventParsingFactory] with updated parser and mapping implementations.
  */
-class DefaultTeachingEventParsingFactory : TeachingEventParsingFactory {
+class DefaultTeachingEventParsingFactory(private val keyGenerator: TeachingEventKeyGenerator) :
+    TeachingEventParsingFactory {
 
     override fun createModuleParser(): EventPropertyParser {
         return DefaultModuleParser(
@@ -29,6 +31,6 @@ class DefaultTeachingEventParsingFactory : TeachingEventParsingFactory {
     }
 
     override fun createDtoMapper(): TeachingEventMapper {
-        return DefaultTeachingEventMapper
+        return DefaultTeachingEventMapper(keyGenerator)
     }
 }
diff --git a/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/impl/DefaultTypeProvider.kt b/backend/src/main/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/parsing/impl/DefaultTypeProvider.kt
@@ -18,6 +18,8 @@ object DefaultTypeProvider : TypeProvider {
         "(Vorlesung und Übung)" to setOf(EventType.LECTURE, EventType.EXERCISE),
         "(Ü/P)" to setOf(EventType.EXERCISE, EventType.PRACTICAL),
         "(V/Ü)" to setOf(EventType.LECTURE, EventType.EXERCISE),
+        "(VÜ)" to setOf(EventType.LECTURE, EventType.EXERCISE),
+        "(SU)" to setOf(EventType.SEMINAR, EventType.EXERCISE),
         "(VÜPS)" to setOf(EventType.LECTURE, EventType.EXERCISE, EventType.PRACTICAL, EventType.SEMINAR),
         "(Tutorium) (Vorlesung und Übung)" to setOf(EventType.TUTORIAL, EventType.LECTURE, EventType.EXERCISE),
     )
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/ical/CreateICalInteractorImplTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/ical/CreateICalInteractorImplTest.kt
@@ -50,6 +50,7 @@ class CreateICalInteractorImplTest {
     fun `should return iCal when teaching event found`() {
         val request = CreateICalInteractor.Request(listOf("1"))
         val teachingEvent = TeachingEventDto(
+            id = "1",
             semester = "BCSP 1",
             day = DayOfWeek.MONDAY,
             startTime = LocalTime.of(8, 0),
@@ -73,6 +74,7 @@ class CreateICalInteractorImplTest {
     fun `should return file name with semester`() {
         val request = CreateICalInteractor.Request(listOf("1"))
         val teachingEvent = TeachingEventDto(
+            id = "1",
             semester = "BCSP 1",
             day = DayOfWeek.MONDAY,
             startTime = LocalTime.of(8, 0),
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/DefaultTeachingEventMapperTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/DefaultTeachingEventMapperTest.kt
@@ -3,14 +3,15 @@ package de.sotterbeck.hbrscalcreator.teachingEvent
 import assertk.assertAll
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator.CombinedTeachingEventKeyGenerator
 import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.impl.DefaultTeachingEventMapper
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import java.time.DayOfWeek
 
 class DefaultTeachingEventMapperTest {
 
-    private val uut = DefaultTeachingEventMapper
+    private val uut = DefaultTeachingEventMapper(CombinedTeachingEventKeyGenerator())
 
     @Test
     fun `should throw exception when keys are missing`() {
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/GetAllTeachingEventsInteractorImplTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/GetAllTeachingEventsInteractorImplTest.kt
@@ -33,6 +33,7 @@ class GetAllTeachingEventsInteractorImplTest {
 
         coEvery { teachingEventRepository.findAllTeachingEvents(any()) } returns listOf(
             TeachingEventDto(
+                id = "1",
                 day = DayOfWeek.MONDAY,
                 startTime = LocalTime.of(8, 0),
                 endTime = LocalTime.of(9, 30),
@@ -45,6 +46,7 @@ class GetAllTeachingEventsInteractorImplTest {
                 semester = "BI 1",
             ),
             TeachingEventDto(
+                id = "2",
                 day = DayOfWeek.TUESDAY,
                 startTime = LocalTime.of(9, 45),
                 endTime = LocalTime.of(11, 15),
@@ -57,6 +59,7 @@ class GetAllTeachingEventsInteractorImplTest {
                 semester = "BI 1"
             ),
             TeachingEventDto(
+                id = "3",
                 day = DayOfWeek.WEDNESDAY,
                 startTime = LocalTime.of(8, 0),
                 endTime = LocalTime.of(9, 30),
@@ -69,6 +72,7 @@ class GetAllTeachingEventsInteractorImplTest {
                 semester = "BI 2"
             ),
             TeachingEventDto(
+                id = "4",
                 day = DayOfWeek.THURSDAY,
                 startTime = LocalTime.of(9, 45),
                 endTime = LocalTime.of(11, 15),
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/GetTeachingEventsInteractorImplTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/GetTeachingEventsInteractorImplTest.kt
@@ -34,6 +34,7 @@ class GetTeachingEventsInteractorImplTest {
 
         coEvery { teachingEventRepository.findAllTeachingEvents(any()) } returns listOf(
             TeachingEventDto(
+                id = "1",
                 day = DayOfWeek.MONDAY,
                 startTime = LocalTime.of(8, 0),
                 endTime = LocalTime.of(9, 30),
@@ -46,6 +47,7 @@ class GetTeachingEventsInteractorImplTest {
                 semester = "BI 1"
             ),
             TeachingEventDto(
+                id = "2",
                 day = DayOfWeek.TUESDAY,
                 startTime = LocalTime.of(9, 45),
                 endTime = LocalTime.of(11, 15),
@@ -58,6 +60,7 @@ class GetTeachingEventsInteractorImplTest {
                 semester = "BI 1"
             ),
             TeachingEventDto(
+                id = "3",
                 day = DayOfWeek.WEDNESDAY,
                 startTime = LocalTime.of(8, 0),
                 endTime = LocalTime.of(9, 30),
@@ -70,6 +73,7 @@ class GetTeachingEventsInteractorImplTest {
                 semester = "BI 2"
             ),
             TeachingEventDto(
+                id = "4",
                 day = DayOfWeek.THURSDAY,
                 startTime = LocalTime.of(9, 45),
                 endTime = LocalTime.of(11, 15),
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventPresenterImplTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventPresenterImplTest.kt
@@ -18,13 +18,13 @@ import java.time.LocalTime
 class TeachingEventPresenterImplTest {
 
     private val uut = TeachingEventPresenterImpl(
-        DefaultTeachingEventParsingFactory(),
-        CombinedTeachingEventKeyGenerator()
+        DefaultTeachingEventParsingFactory(CombinedTeachingEventKeyGenerator()),
     )
 
     @Test
     fun `should format lecture`() {
         val lecture = TeachingEventDto(
+            id = "1",
             day = DayOfWeek.TUESDAY,
             startTime = LocalTime.of(9, 45),
             endTime = LocalTime.of(11, 15),
@@ -63,6 +63,7 @@ class TeachingEventPresenterImplTest {
     @Test
     fun `should format exercise`() {
         val exercise = TeachingEventDto(
+            id = "2",
             day = DayOfWeek.MONDAY,
             startTime = LocalTime.of(8, 0),
             endTime = LocalTime.of(9, 30),
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventRepositoryImplTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/TeachingEventRepositoryImplTest.kt
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/CombinedTeachingEventKeyGeneratorTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/CombinedTeachingEventKeyGeneratorTest.kt
diff --git a/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/HashTeachingEventKeyGeneratorTest.kt b/backend/src/test/kotlin/de/sotterbeck/hbrscalcreator/teachingEvent/idGenerator/HashTeachingEventKeyGeneratorTest.kt
diff --git a/frontend/app/semesters/continue-button.tsx b/frontend/app/semesters/continue-button.tsx
diff --git a/frontend/lib/api/data.ts b/frontend/lib/api/data.ts
diff --git a/frontend/lib/semester/hiddenSemesters.ts b/frontend/lib/semester/hiddenSemesters.ts

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`package de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator`
`2`	`2`
`3`		`-import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto`
`4`		`-`
`5`	`3`	`interface TeachingEventKeyGenerator {`
`6`	`4`
`7`		`- fun generateKey(teachingEvent: TeachingEventDto): String`
	`5`	`+ fun generateKey(teachingEvent: Map<String, String>): String`
`8`	`6`
`9`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package de.sotterbeck.hbrscalcreator.teachingEvent.parsing`
`3`	`3`	`import de.sotterbeck.hbrscalcreator.teachingEvent.TeachingEventDto`
`4`	`4`
`5`	`5`	`/**`
`6`		`- * Maps a teaching event from the raw data to a DTO.`
	`6`	`+ * Maps a teaching event from the raw data to a DTO and assigns a unique ID.`
`7`	`7`	`* It only does the mapping, no validation or formatting.`
`8`	`8`	`*`
`9`	`9`	`* Formatting is the responsibility of the [TeachingEventPresenter].`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package de.sotterbeck.hbrscalcreator.teachingEvent.parsing.impl`
`2`	`2`
	`3`	`+import de.sotterbeck.hbrscalcreator.teachingEvent.idGenerator.TeachingEventKeyGenerator`
`3`	`4`	`import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.EventPropertyParser`
`4`	`5`	`import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventMapper`
`5`	`6`	`import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TeachingEventParsingFactory`
`@@ -12,7 +13,8 @@ import de.sotterbeck.hbrscalcreator.teachingEvent.parsing.TypeProvider`
`12`	`13`	`*`
`13`	`14`	`* To extend support for other terms, implement a new [TeachingEventParsingFactory] with updated parser and mapping implementations.`
`14`	`15`	`*/`
`15`		`-class DefaultTeachingEventParsingFactory : TeachingEventParsingFactory {`
	`16`	`+class DefaultTeachingEventParsingFactory(private val keyGenerator: TeachingEventKeyGenerator) :`
	`17`	`+ TeachingEventParsingFactory {`
`16`	`18`
`17`	`19`	`override fun createModuleParser(): EventPropertyParser {`
`18`	`20`	`return DefaultModuleParser(`
`@@ -29,6 +31,6 @@ class DefaultTeachingEventParsingFactory : TeachingEventParsingFactory {`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`override fun createDtoMapper(): TeachingEventMapper {`
`32`		`- return DefaultTeachingEventMapper`
	`34`	`+ return DefaultTeachingEventMapper(keyGenerator)`
`33`	`35`	`}`
`34`	`36`	`}`