sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix matching mailboxes when there is more than one space between words (#1964)

Browse Source
This commit is contained in:
Mikołaj Pich 2022-09-02 20:19:19 +02:00 committed by GitHub
parent 83ca9a7060
commit 157becb017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -186,7 +186,7 @@ ext {
} }
dependencies { dependencies {
implementation "io.github.wulkanowy:sdk:1.7.4" implementation "io.github.wulkanowy:sdk:dcd8bd8b19"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'

10
app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
View File

@ -60,16 +60,18 @@ class MailboxRepository @Inject constructor(
} }
private fun String.normalizeStudentName(): String { private fun String.normalizeStudentName(): String {
return trim().split(" ").joinToString(" ") { part -> return trim().split(" ")
part.lowercase().replaceFirstChar { it.uppercase() } .filter { it.isNotBlank() }
} .joinToString(" ") { part ->
part.lowercase().replaceFirstChar { it.uppercase() }
}
} }
private fun String.getFirstAndLastPart(): String { private fun String.getFirstAndLastPart(): String {
val parts = normalizeStudentName().split(" ") val parts = normalizeStudentName().split(" ")
val endParts = parts.filterIndexed { i, _ -> val endParts = parts.filterIndexed { i, _ ->
i == 0 || parts.size == i - 1 i == 0 || parts.size - 1 == i
} }
return endParts.joinToString(" ") return endParts.joinToString(" ")
} }

14
app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
View File

@ -91,6 +91,20 @@ class MailboxRepositoryTest {
assertEquals(expectedMailbox, systemUnderTest.getMailbox(student)) assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
} }
@Test
fun `get mailbox for unique non-authorized student but with spaces`() = runTest {
val student = getStudentEntity(
userName = "Stanisław Kowalski",
studentName = "J** K*******",
)
val expectedMailbox = getMailboxEntity("Jan Kowalski")
coEvery { mailboxDao.loadAll(any()) } returns listOf(
expectedMailbox,
)
assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
}
@Test(expected = IllegalArgumentException::class) @Test(expected = IllegalArgumentException::class)
fun `get mailbox for not-unique non-authorized student`() = runTest { fun `get mailbox for not-unique non-authorized student`() = runTest {
val student = getStudentEntity( val student = getStudentEntity(