bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tibor' into 'master'

Browse Source 
API 1.0.50+1 AppText Translations.translation

See merge request bossanyit/aitrainer_server!74
This commit is contained in:
Bossányi Tibor 2021-09-14 05:44:41 +00:00
commit adf75fd088
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/db/update_1_0_50.sql
View File

@ -15,7 +15,7 @@ CREATE TABLE `app_text_translation` (
`translation_id` INT(13) NOT NULL AUTO_INCREMENT, `translation_id` INT(13) NOT NULL AUTO_INCREMENT,
`text_id` INT(11) NOT NULL, `text_id` INT(11) NOT NULL,
`language_code` CHAR(2) NOT NULL DEFAULT 'en' COLLATE 'utf8mb4_general_ci', `language_code` CHAR(2) NOT NULL DEFAULT 'en' COLLATE 'utf8mb4_general_ci',
`text` CHAR(50) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci', `translation` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`translation_id`) USING BTREE PRIMARY KEY (`translation_id`) USING BTREE
) )
COLLATE='utf8mb4_general_ci' COLLATE='utf8mb4_general_ci'

2
src/main/kotlin/com/aitrainer/api/model/AppTextTranslation.kt
View File

@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank
data class AppTextTranslation ( data class AppTextTranslation (
@Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var translationId: Long = 0, @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var translationId: Long = 0,
@Expose @get: NotBlank var languageCode: String? = "hu", @Expose @get: NotBlank var languageCode: String? = "hu",
@Expose @get: NonNull var text: String? = null @Expose @get: NonNull var translation: String? = null
) { ) {
@ManyToOne(fetch = FetchType.LAZY, optional = false) @ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "textId", nullable = false) @JoinColumn(name = "textId", nullable = false)

14
src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt
View File

@ -179,14 +179,14 @@ class AppPackageTest {
val trainingPlanJson: String = record[1] val trainingPlanJson: String = record[1]
val type = object : TypeToken<List<TrainingPlan?>?>() {}.type val type = object : TypeToken<List<TrainingPlan?>?>() {}.type
val plans: List<TrainingPlan> = gson.fromJson(trainingPlanJson, type) val plans: List<TrainingPlan> = gson.fromJson(trainingPlanJson, type)
assertEquals(plans.size,10) assertEquals(plans.size,39)
assertEquals(plans[1].name, "Beginner Men’s workout") assertEquals(plans[1].name, "Beginner Men’s workout")
assertEquals(plans[1].internalName, "beginner_man") assertEquals(plans[1].internalName, "beginner_man")
assertEquals(plans[1].free, true) assertEquals(plans[1].free, true)
assertEquals(plans[1].active, true) assertEquals(plans[1].active, true)
assertEquals(plans[1].treeId, 37) assertEquals(plans[1].treeId, 37)
assertEquals(plans[0].details[0].exerciseTypeId, 37) assertEquals(plans[0].details[0].exerciseTypeId, 37)
assertEquals(plans[0].details[1].weight, 20.0) assertEquals(plans[0].details[1].weight, -1.0)
} else if (record[0] == SplitTests::class.simpleName) { } else if (record[0] == SplitTests::class.simpleName) {
val splitTestJson: String = record[1] val splitTestJson: String = record[1]
val type = object : TypeToken<List<SplitTests?>?>() {}.type val type = object : TypeToken<List<SplitTests?>?>() {}.type
@ -201,16 +201,16 @@ class AppPackageTest {
val trainingPlanDayJson: String = record[1] val trainingPlanDayJson: String = record[1]
val type = object : TypeToken<List<TrainingPlanDay?>?>() {}.type val type = object : TypeToken<List<TrainingPlanDay?>?>() {}.type
val days: List<TrainingPlanDay> = gson.fromJson(trainingPlanDayJson, type) val days: List<TrainingPlanDay> = gson.fromJson(trainingPlanDayJson, type)
assertEquals(days.size,3) assertEquals(days.size,33)
assertEquals(days[0].name, "Mo") assertEquals(days[0].name, "Mo")
assertEquals(days[0].translations[0].nameTranslation, "H") assertEquals(days[0].translations[0].nameTranslation, "Hé")
} else if (record[0] == AppText::class.simpleName) { } else if (record[0] == AppText::class.simpleName) {
val appTextJson: String = record[1] val appTextJson: String = record[1]
val type = object : TypeToken<List<AppText?>?>() {}.type val type = object : TypeToken<List<AppText?>?>() {}.type
val texts: List<AppText> = gson.fromJson(appTextJson, type) val texts: List<AppText> = gson.fromJson(appTextJson, type)
assertEquals(texts.size, 1) assertEquals(texts.size, 2)
assertEquals(texts[0].translations[0].text, "Done!") assertEquals(texts[0].translations[0].translation, "Done!")
assertEquals(texts[0].translations[1].text, "Kész!") assertEquals(texts[0].translations[1].translation, "Kész!")
} }
} }
} }