PROD.2026/RekomenciMobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

<type>(scope): <description>

Browse Source 
[body]

[footer(s)]
This commit is contained in:
ITQ
2025-11-23 15:23:24 +03:00
parent afea49db37
commit c10442b827
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/prodhack/moscow2025/data/data_providers/local_db/entities/ResumeEntity.kt
+1 -1
View File
@@ -38,7 +38,7 @@ data class ResumeEntity(
fromSalary, fromSalary,
toSalary toSalary
), ),
recommendedSkills = recommendedSkills.split("|"), recommendedSkills = if (recommendedSkills.isBlank()) emptyList() else recommendedSkills.split("|").filter { it.isNotBlank() },
city = city, city = city,
experience = JsonTypeConverters.toWorkExperienceList(experience), experience = JsonTypeConverters.toWorkExperienceList(experience),
education = JsonTypeConverters.toEducationList(education), education = JsonTypeConverters.toEducationList(education),
app/src/main/java/com/prodhack/moscow2025/data/data_providers/local_db/entities/ResumeHistoryEntity.kt
+1 -1
View File
@@ -37,7 +37,7 @@ data class ResumeHistoryEntity(
experienceType = ExperienceType.valueOf(experienceType), experienceType = ExperienceType.valueOf(experienceType),
skills = keySkills.split("|"), skills = keySkills.split("|"),
prediction = Pair(fromSalary, toSalary), prediction = Pair(fromSalary, toSalary),
recommendedSkills = recommendedSkills.split("|"), recommendedSkills = if (recommendedSkills.isBlank()) emptyList() else recommendedSkills.split("|").filter { it.isNotBlank() },
city = city, city = city,
experience = JsonTypeConverters.toWorkExperienceList(experience), experience = JsonTypeConverters.toWorkExperienceList(experience),
education = JsonTypeConverters.toEducationList(education), education = JsonTypeConverters.toEducationList(education),
app/src/main/java/com/prodhack/moscow2025/data/dto/ResumeDtos.kt
+4 -4
View File
@@ -71,8 +71,8 @@ data class ResumeDTO(
experienceType = experienceType.mapToDomain(), experienceType = experienceType.mapToDomain(),
prediction = prediction?.let { prediction = prediction?.let {
Pair( Pair(
it.fromSalary.toIntOrNull(), it.fromSalary.toDoubleOrNull()?.toInt(),
it.toSalary.toIntOrNull() it.toSalary.toDoubleOrNull()?.toInt()
) )
}, },
recommendedSkills = prediction?.recommendedSkills, recommendedSkills = prediction?.recommendedSkills,
@@ -87,8 +87,8 @@ data class ResumeDTO(
aboutMe = aboutMe, aboutMe = aboutMe,
keySkills = keySkills.joinToString("|"), keySkills = keySkills.joinToString("|"),
position = position, position = position,
fromSalary = prediction?.fromSalary?.toIntOrNull(), fromSalary = prediction?.fromSalary?.toDoubleOrNull()?.toInt(),
toSalary = prediction?.toSalary?.toIntOrNull(), toSalary = prediction?.toSalary?.toDoubleOrNull()?.toInt(),
recommendedSkills = prediction?.recommendedSkills?.joinToString("|") ?: "", recommendedSkills = prediction?.recommendedSkills?.joinToString("|") ?: "",
experienceType = experienceType.mapToDomain().name, experienceType = experienceType.mapToDomain().name,
city = city, city = city,
app/src/main/java/com/prodhack/moscow2025/presentation/screens/login/LoginScreen.kt
+6 -1
View File
@@ -64,7 +64,12 @@ fun ErrorCollectorScope.LoginScreen(
Pair("user2@mail.ru", "qQW!!!.rty3nqc18123"), Pair("user2@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user3@mail.ru", "qQW!!!.rty3nqc18123"), Pair("user3@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user4@mail.ru", "qQW!!!.rty3nqc18123"), Pair("user4@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user5@mail.ru", "qQW!!!.rty3nqc18123") Pair("user5@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user6@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user7@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user8@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user9@mail.ru", "qQW!!!.rty3nqc18123"),
Pair("user10@mail.ru", "qQW!!!.rty3nqc18123"),
) )
val typography = MaterialTheme.typography val typography = MaterialTheme.typography
app/src/test/java/com/prodhack/moscow2025/domain/usecase/GetDefaultPhoneNumberPatternUseCaseTest.kt
+5 -2
View File
@@ -27,10 +27,13 @@ class GetDefaultPhoneNumberPatternUseCaseTest {
val useCase = GetDefaultPhoneNumberPatternUseCase() val useCase = GetDefaultPhoneNumberPatternUseCase()
val result = useCase.execute() val result = useCase.execute()
val systemLocale = Locale.getDefault().country val systemLocale = Locale.getDefault().country
if (result != null) { if (result != null) {
// If a pattern is found, it should match the system locale // If a pattern is found, it should match the system locale
assertEquals(systemLocale, result.countryCodeISO, ignoreCase = true) assertTrue(
"Pattern country code should match system locale",
systemLocale.equals(result.countryCodeISO, ignoreCase = true)
)
} else { } else {
// If no pattern found, system locale might not be in the list // If no pattern found, system locale might not be in the list
val hasPatternForLocale = PhoneNumberPatternsProvider.phoneNumberPatterns.any { val hasPatternForLocale = PhoneNumberPatternsProvider.phoneNumberPatterns.any {