Skip to content

Commit

Permalink
2647 manage voices
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElenaSpb
ElenaSpb committed Nov 23, 2024
1 parent 0a7d357 commit 59c5263
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/main/kotlin/com/epam/brn/dto/AudioFileMetaData.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.epam.brn.dto.azure.tts.AzureRates
data class AudioFileMetaData(
var text: String,
val locale: String,
val voice: String,
var voice: String,
var speedFloat: String = "1",
var speedCode: AzureRates = AzureRates.DEFAULT,
val gender: String? = null,
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/com/epam/brn/enums/Voice.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ enum class Voice {
NICK,
ERKANYAVAS,
OKSANA,
marina,
lera,
ALYSS,
SILAERKAN
}
24 changes: 20 additions & 4 deletions src/main/kotlin/com/epam/brn/service/impl/UserAnalyticsServiceImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import com.epam.brn.dto.AudioFileMetaData
import com.epam.brn.dto.response.UserWithAnalyticsResponse
import com.epam.brn.dto.statistics.DayStudyStatistics
import com.epam.brn.enums.ExerciseType
import com.epam.brn.enums.Voice
import com.epam.brn.model.StudyHistory
import com.epam.brn.model.UserAccount
import com.epam.brn.repo.ExerciseRepository
import com.epam.brn.repo.StudyHistoryRepository
import com.epam.brn.repo.UserAccountRepository
Expand All @@ -17,6 +19,7 @@ import com.epam.brn.service.statistics.UserPeriodStatisticsService
import org.springframework.data.domain.Pageable
import org.springframework.stereotype.Service
import java.io.InputStream
import java.time.LocalDate
import java.time.LocalTime
import java.time.temporal.WeekFields
import java.util.Locale
Expand Down Expand Up @@ -72,20 +75,33 @@ class UserAnalyticsServiceImpl(
)

override fun prepareAudioFileMetaData(exerciseId: Long, audioFileMetaData: AudioFileMetaData): AudioFileMetaData {
val currentUserId = userAccountService.getCurrentUserId()
val lastExerciseHistory = studyHistoryRepository
.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
val seriesType = ExerciseType.valueOf(exerciseRepository.findTypeByExerciseId(exerciseId))
val text = audioFileMetaData.text
if (!listTextExercises.contains(seriesType))
audioFileMetaData.text = text.replace(" ", ", ")
val currentUser = userAccountService.getCurrentUser()
audioFileMetaData.voice = choseVoiceForUser(currentUser)
setSpeedForUser(currentUser, exerciseId, audioFileMetaData)
return audioFileMetaData
}

fun setSpeedForUser(user: UserAccount, exerciseId: Long, audioFileMetaData: AudioFileMetaData) {
val lastExerciseHistory = studyHistoryRepository
.findLastByUserAccountIdAndExerciseId(user.id!!, exerciseId)
if (lastExerciseHistory == null)
audioFileMetaData.setSpeedNormal()
else if (isDoneBad(lastExerciseHistory))
audioFileMetaData.setSpeedSlow()
else if (isDoneWell(lastExerciseHistory))
audioFileMetaData.setSpeedFaster()
return audioFileMetaData
}

fun choseVoiceForUser(user: UserAccount): String {
if (user.bornYear == null)
return Voice.marina.name
val ages = LocalDate.now().year - user.bornYear!!
return if (ages < 19) Voice.marina.name
else Voice.lera.name
}

fun isDoneBad(lastHistory: StudyHistory?): Boolean =
Expand Down
76 changes: 63 additions & 13 deletions src/test/kotlin/com/epam/brn/service/UserAnalyticsServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ internal class UserAnalyticsServiceTest {
fun `should prepareAudioFileMetaData with adding comma and slow speed for words with good stat WORDS`() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
Expand All @@ -140,7 +143,10 @@ internal class UserAnalyticsServiceTest {
fun `should prepareAudioFileMetaData without adding comma and slow speed for words with good stat PHRASES`() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
Expand All @@ -158,10 +164,13 @@ internal class UserAnalyticsServiceTest {
}

@Test
fun `should prepareAudioFileMetaData with adding comma and slowest speed for words with bad stat WORDS`() {
fun `should prepareAudioFileMetaData with adding comma and slowest speed for words with bad stat WORDS `() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
Expand All @@ -177,13 +186,38 @@ internal class UserAnalyticsServiceTest {
metaDataResult.speedFloat shouldBe "0.8"
metaDataResult.speedCode shouldBe AzureRates.SLOW
metaDataResult.text shouldBe "мама, папа"
metaDataResult.voice shouldBe Voice.marina.name
}

@Test
fun `should prepareAudioFileMetaData with lera voice up to 18 years old user`() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2000
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
every { exerciseService.isDoneWell(studyHistory) } returns true
every { exerciseRepository.findTypeByExerciseId(exerciseId) } returns ExerciseType.SINGLE_SIMPLE_WORDS.name
val audioFileMetaData =
AudioFileMetaData("мама папа", BrnLocale.RU.locale, "", "1", AzureRates.DEFAULT)
// WHEN
val metaDataResult = userAnalyticsService.prepareAudioFileMetaData(exerciseId, audioFileMetaData)
// THEN
metaDataResult.voice shouldBe Voice.lera.name
}

@Test
fun `should prepareAudioFileMetaData without adding comma and slowest speed for words with bad stat PHRASES`() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
Expand All @@ -205,13 +239,17 @@ internal class UserAnalyticsServiceTest {
fun `should prepareAudioFileMetaData default speed correctly for one word and good statistics`() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
every { exerciseService.isDoneWell(studyHistory) } returns true
every { exerciseRepository.findTypeByExerciseId(exerciseId) } returns ExerciseType.SINGLE_SIMPLE_WORDS.name
val audioFileMetaData = AudioFileMetaData("мама", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)
val audioFileMetaData =
AudioFileMetaData("мама", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)

// WHEN
val metaDataResult = userAnalyticsService.prepareAudioFileMetaData(exerciseId, audioFileMetaData)
Expand All @@ -226,13 +264,17 @@ internal class UserAnalyticsServiceTest {
fun `should prepareAudioFileMetaData slow correctly for single word and bad statistics`() {
// GIVEN
val studyHistory = mockk<StudyHistory>()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
every { exerciseService.isDoneWell(studyHistory) } returns false
every { exerciseRepository.findTypeByExerciseId(exerciseId) } returns ExerciseType.SINGLE_SIMPLE_WORDS.name
val audioFileMetaData = AudioFileMetaData("text", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)
val audioFileMetaData =
AudioFileMetaData("text", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)

// WHEN
val metaDataResult = userAnalyticsService.prepareAudioFileMetaData(exerciseId, audioFileMetaData)
Expand All @@ -245,12 +287,16 @@ internal class UserAnalyticsServiceTest {
@Test
fun `should prepareAudioFileMetaData normal speed for single word`() {
// GIVEN
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns null
every { exerciseRepository.findTypeByExerciseId(exerciseId) } returns ExerciseType.SINGLE_SIMPLE_WORDS.name
val audioFileMetaData = AudioFileMetaData("text", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)
val audioFileMetaData =
AudioFileMetaData("text", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)
// WHEN
val metaDataResult = userAnalyticsService.prepareAudioFileMetaData(exerciseId, audioFileMetaData)
// THEN
Expand All @@ -263,13 +309,17 @@ internal class UserAnalyticsServiceTest {
// GIVEN
val studyHistory = mockk<StudyHistory>()
val audioStreamMock = InputStream.nullInputStream()
every { userAccountService.getCurrentUserId() } returns currentUserId
val currentUser = mockk<UserAccount>()
every { userAccountService.getCurrentUser() } returns currentUser
every { currentUser.bornYear } returns 2023
every { currentUser.id } returns currentUserId
every {
studyHistoryRepository.findLastByUserAccountIdAndExerciseId(currentUserId, exerciseId)
} returns studyHistory
every { exerciseService.isDoneWell(studyHistory) } returns false
every { exerciseRepository.findTypeByExerciseId(exerciseId) } returns ExerciseType.SINGLE_SIMPLE_WORDS.name
val audioFileMetaData = AudioFileMetaData("text", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)
val audioFileMetaData =
AudioFileMetaData("text", BrnLocale.RU.locale, Voice.FILIPP.name, "1", AzureRates.DEFAULT)
every { textToSpeechService.generateAudioOggStreamWithValidation(audioFileMetaData) } returns audioStreamMock
// WHEN
val audioStreamResult = userAnalyticsService.prepareAudioStreamForUser(exerciseId, audioFileMetaData)
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ yandex.getTokenLink=https://iam.api.cloud.yandex.net/iam/v1/tokens
yandex.generationAudioLink=https://tts.api.cloud.yandex.net/speech/v1/tts:synthesize
yandex.folderId=b1gqn2760f5ongt82lm3
yandex.format=oggopus
yandex.emotions=good
yandex.emotions=friendly
yandex.folderForFiles=audioTest

brn.resources.default-pictures.path=pictures/
Expand Down

0 comments on commit 59c5263

Please sign in to comment.