diff --git a/data/db/update_1_0_50.sql b/data/db/update_1_0_50.sql index 6b04915..58e2756 100644 --- a/data/db/update_1_0_50.sql +++ b/data/db/update_1_0_50.sql @@ -15,7 +15,7 @@ CREATE TABLE `app_text_translation` ( `translation_id` INT(13) NOT NULL AUTO_INCREMENT, `text_id` INT(11) NOT NULL, `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 ) COLLATE='utf8mb4_general_ci' diff --git a/src/main/kotlin/com/aitrainer/api/model/AppTextTranslation.kt b/src/main/kotlin/com/aitrainer/api/model/AppTextTranslation.kt index 72bbf6e..db0499f 100644 --- a/src/main/kotlin/com/aitrainer/api/model/AppTextTranslation.kt +++ b/src/main/kotlin/com/aitrainer/api/model/AppTextTranslation.kt @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank data class AppTextTranslation ( @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var translationId: Long = 0, @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) @JoinColumn(name = "textId", nullable = false) diff --git a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt index 6f021ef..e49f964 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt @@ -179,14 +179,14 @@ class AppPackageTest { val trainingPlanJson: String = record[1] val type = object : TypeToken?>() {}.type val plans: List = gson.fromJson(trainingPlanJson, type) - assertEquals(plans.size,10) + assertEquals(plans.size,39) assertEquals(plans[1].name, "Beginner Men’s workout") assertEquals(plans[1].internalName, "beginner_man") assertEquals(plans[1].free, true) assertEquals(plans[1].active, true) assertEquals(plans[1].treeId, 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) { val splitTestJson: String = record[1] val type = object : TypeToken?>() {}.type @@ -201,16 +201,16 @@ class AppPackageTest { val trainingPlanDayJson: String = record[1] val type = object : TypeToken?>() {}.type val days: List = gson.fromJson(trainingPlanDayJson, type) - assertEquals(days.size,3) + assertEquals(days.size,33) 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) { val appTextJson: String = record[1] val type = object : TypeToken?>() {}.type val texts: List = gson.fromJson(appTextJson, type) - assertEquals(texts.size, 1) - assertEquals(texts[0].translations[0].text, "Done!") - assertEquals(texts[0].translations[1].text, "Kész!") + assertEquals(texts.size, 2) + assertEquals(texts[0].translations[0].translation, "Done!") + assertEquals(texts[0].translations[1].translation, "Kész!") } } }