wulkanowy/sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Trim whitespaces from strings in GradeSummary

Browse source
This commit is contained in:
Mikołaj Pich 2022-05-16 21:29:42 +02:00
parent 3ecb494372
commit 189f5ecee0
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
View file

@ -33,14 +33,14 @@ fun LocalDate.getLastMonday(): LocalDate = with(previousOrSame(MONDAY))
fun LocalDate.getSchoolYear(): Int = if (month.value > 8) year else year - 1
fun getGradeShortValue(value: String?): String {
return when (value) {
return when (value?.trim()) {
"celujący" -> "6"
"bardzo dobry" -> "5"
"dobry" -> "4"
"dostateczny" -> "3"
"dopuszczający" -> "2"
"niedostateczny" -> "1"
else -> value ?: ""
else -> value.orEmpty().trim()
}
}

8
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/grades/GradesMapper.kt
View file

@ -49,13 +49,13 @@ fun GradesResponse.mapGradesSummary() = gradesWithSubjects.map { subject ->
GradeSummary(
visibleSubject = subject.visibleSubject,
order = subject.order,
name = subject.name,
name = subject.name.trim(),
average = subject.average,
predicted = getGradeShortValue(subject.proposed),
final = getGradeShortValue(subject.annual),
pointsSum = subject.pointsSum.takeIf { it != "-" }.orEmpty(),
proposedPoints = subject.proposedPoints.orEmpty(),
finalPoints = subject.finalPoints.orEmpty()
pointsSum = subject.pointsSum.takeIf { it != "-" }.orEmpty().trim(),
proposedPoints = subject.proposedPoints.orEmpty().trim(),
finalPoints = subject.finalPoints.orEmpty().trim(),
)
}.sortedBy { it.name }.toList()

14
sdk-scrapper/src/test/resources/io/github/wulkanowy/sdk/scrapper/grades/Oceny.json
View file

@ -26,8 +26,8 @@
"KolorOceny": 15748172
}
],
"ProponowanaOcenaRoczna": "",
"OcenaRoczna": "",
"ProponowanaOcenaRoczna": " ",
"OcenaRoczna": " ",
"ProponowanaOcenaRocznaPunkty": null,
"OcenaRocznaPunkty": null,
"Srednia": 0,
@ -67,7 +67,7 @@
}
],
"ProponowanaOcenaRoczna": "3",
"OcenaRoczna": "dobry",
"OcenaRoczna": " dobry ",
"ProponowanaOcenaRocznaPunkty": null,
"OcenaRocznaPunkty": null,
"Srednia": 0,
@ -147,7 +147,7 @@
}
],
"ProponowanaOcenaRoczna": "4/5",
"OcenaRoczna": "bardzo dobry",
"OcenaRoczna": " bardzo dobry",
"ProponowanaOcenaRocznaPunkty": null,
"OcenaRocznaPunkty": null,
"Srednia": 0,
@ -177,7 +177,7 @@
"KolorOceny": 0
}
],
"ProponowanaOcenaRoczna": "4-",
"ProponowanaOcenaRoczna": "4- ",
"OcenaRoczna": "5-",
"ProponowanaOcenaRocznaPunkty": null,
"OcenaRocznaPunkty": null,
@ -199,8 +199,8 @@
"KolorOceny": 0
}
],
"ProponowanaOcenaRoczna": "",
"OcenaRoczna": "",
"ProponowanaOcenaRoczna": " ",
"OcenaRoczna": " ",
"ProponowanaOcenaRocznaPunkty": null,
"OcenaRocznaPunkty": null,
"Srednia": 0,