API 1.0.54 training program
This commit is contained in:
@@ -28,7 +28,8 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
|
||||
private val trainingPlanRepository: TrainingPlanRepository,
|
||||
private val splitTestsRepository: SplitTestsRepository,
|
||||
private val trainingPlanDayRepository: TrainingPlanDayRepository,
|
||||
private val appTextRepository: AppTextRepository
|
||||
private val appTextRepository: AppTextRepository,
|
||||
private val trainingProgramRepository: TrainingProgramRepository
|
||||
) {
|
||||
private val logger = LoggerFactory.getLogger(javaClass)
|
||||
|
||||
@@ -91,6 +92,9 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
|
||||
val listAppText = appTextRepository.findAll()
|
||||
val listAppTextJson = gson.toJson(listAppText)
|
||||
|
||||
val listTrainingProgram = trainingProgramRepository.findAll()
|
||||
val listTrainingProgramJson = gson.toJson(listTrainingProgram)
|
||||
|
||||
val packageJson: String =
|
||||
getClassRecord(ExerciseDevice::class.simpleName, listDevicesJson) +
|
||||
"|||" + getClassRecord(Product::class.simpleName, listProductsJson) +
|
||||
@@ -108,7 +112,8 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
|
||||
"|||" + getClassRecord(TrainingPlan::class.simpleName, listTrainingPlanJson) +
|
||||
"|||" + getClassRecord(SplitTests::class.simpleName, listSplitTestsJson) +
|
||||
"|||" + getClassRecord(TrainingPlanDay::class.simpleName, listTrainingPlanDayJson) +
|
||||
"|||" + getClassRecord(AppText::class.simpleName, listAppTextJson)
|
||||
"|||" + getClassRecord(AppText::class.simpleName, listAppTextJson) +
|
||||
"|||" + getClassRecord(TrainingProgram::class.simpleName, listTrainingProgramJson)
|
||||
|
||||
return if (packageJson.isEmpty()) ResponseEntity.notFound().build() else
|
||||
ResponseEntity.ok().body(packageJson)
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.aitrainer.api.model
|
||||
|
||||
import com.google.gson.annotations.Expose
|
||||
import org.hibernate.annotations.Fetch
|
||||
import org.hibernate.annotations.FetchMode
|
||||
import org.springframework.lang.NonNull
|
||||
import javax.persistence.*
|
||||
|
||||
@Entity
|
||||
data class TrainingProgram (
|
||||
@Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var trainingProgramId: Long = 0,
|
||||
@Expose @get: NonNull var name: String,
|
||||
|
||||
)
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.aitrainer.api.repository
|
||||
|
||||
import com.aitrainer.api.model.TrainingProgram
|
||||
import org.springframework.data.jpa.repository.JpaRepository
|
||||
import org.springframework.stereotype.Repository
|
||||
|
||||
@Repository
|
||||
interface TrainingProgramRepository: JpaRepository<TrainingProgram, Int> {
|
||||
}
|
||||
@@ -17,6 +17,6 @@ logging.config=classpath:logback-spring.xml
|
||||
logging.file=logs
|
||||
|
||||
# if the database structure has been changed, increment this version number
|
||||
application.version=1.0.53
|
||||
application.version=1.0.54
|
||||
|
||||
jwt.secret=aitrainer
|
||||
@@ -17,7 +17,7 @@ logging.config=classpath:logback-spring.xml
|
||||
logging.file=logs
|
||||
|
||||
# if the database structure has been changed, increment this version number
|
||||
application.version=1.0.53
|
||||
application.version=1.0.54
|
||||
|
||||
jwt.secret=aitrainer
|
||||
jasypt.encryptor.password=Tibor
|
||||
|
||||
@@ -51,6 +51,8 @@ class AppPackageTest {
|
||||
private lateinit var trainingPlanDayRepository: TrainingPlanDayRepository
|
||||
@Autowired
|
||||
private lateinit var appTextRepository: AppTextRepository
|
||||
@Autowired
|
||||
private lateinit var trainingProgramRepository: TrainingProgramRepository
|
||||
|
||||
@Test
|
||||
fun testAppPackage() {
|
||||
@@ -73,7 +75,8 @@ class AppPackageTest {
|
||||
trainingPlanRepository,
|
||||
splitTestsRepository,
|
||||
trainingPlanDayRepository,
|
||||
appTextRepository
|
||||
appTextRepository,
|
||||
trainingProgramRepository
|
||||
)
|
||||
val response: ResponseEntity<*> = controller.getPackageData()
|
||||
|
||||
@@ -211,6 +214,13 @@ class AppPackageTest {
|
||||
assertEquals(texts.size, 2)
|
||||
assertEquals(texts[0].translations[0].translation, "Done!")
|
||||
assertEquals(texts[0].translations[1].translation, "Kész!")
|
||||
} else if (record[0] == TrainingProgram::class.simpleName) {
|
||||
val trainingProgramJson: String = record[1]
|
||||
val type = object : TypeToken<List<TrainingProgram?>?>() {}.type
|
||||
val programs: List<TrainingProgram> = gson.fromJson(trainingProgramJson, type)
|
||||
assertEquals(programs.size, 2)
|
||||
assertEquals(programs[0].name, "TopForm")
|
||||
assertEquals(programs[1].name, "WeightLoss")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user