fix: Juniors in importing timetable

Odyssey-Of-The-Mind-Poland · Mar 28, 2024 · c065119 · c065119
1 parent df3c034
commit c065119
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/main/kotlin/odyseja/odysejapka/gad/Team.kt b/src/main/kotlin/odyseja/odysejapka/gad/Team.kt
@@ -1,6 +1,4 @@
 import odyseja.odysejapka.domain.Performance
-import org.checkerframework.checker.lock.qual.LockHeld
-import javax.persistence.Column
 
 data class Team(
     val performanceHour: String,
@@ -27,18 +25,26 @@ data class Team(
     }
 
     fun getAge(): String {
-        return code[3].toString()
+        val code = code[3].toString()
+        if (code == "J") {
+            return "0"
+        }
+        return code
     }
 
     fun getProblem(): String {
-        return code[1].toString()
+        val code = code[1].toString()
+        if (code == "J") {
+            return "0"
+        }
+        return code
     }
 
     fun getSpontanDay(): String {
         if (day.lowercase().contains("sobota")) {
-            return "sobota"
+            return "niedziela"
         }
-        return "niedziela"
+        return "sobota"
     }
 
     fun toPerformance(city: String): Performance {
@@ -52,7 +58,7 @@ data class Team(
             performanceHour,
             spontanHour,
             part.toInt(),
-            day,
+            day.lowercase(),
             getSpontanDay(),
             league,
             zspRow = zspRow,

diff --git a/src/main/kotlin/odyseja/odysejapka/timetable/ImportTimetableService.kt b/src/main/kotlin/odyseja/odysejapka/timetable/ImportTimetableService.kt
@@ -29,6 +29,7 @@ class ImportTimetableService(
         val jsonFactory = GsonFactory.getDefaultInstance()
         val sheetsAdapter = ZspSheetsAdapter(credentials, jsonFactory, zspId)
         val cityName = cityRepository.findFirstById(cityId).name
+        performanceService.deleteCity(cityId)
         importer = TimeTableImporter(performanceService, sheetsAdapter, cityName)
 
         job = Thread {