API 1.0.46 TrainingPlanDay

src/main/kotlin/com/aitrainer/api/controller/ControllerAspect.kt

@@ -70,11 +70,6 @@ class ControllerAspect {
         Singleton.checkDBUpdate(configurationRepository, properties)
     }
 
-    @Before("execution(* com.aitrainer.api.controller.ProductTestController.*(..))")
-    fun productTestControllerAspect(joinPoint: JoinPoint) {
-        println("product test controller")
-        Singleton.checkDBUpdate(configurationRepository, properties)
-    }
 
     @Before("execution(* com.aitrainer.api.controller.PropertyController.*(..))")
     fun propertyControllerAspect(joinPoint: JoinPoint) {
@@ -94,4 +89,31 @@ class ControllerAspect {
         Singleton.checkDBUpdate(configurationRepository, properties)
     }
 
+    @Before("execution(* com.aitrainer.api.controller.SportController.*(..))")
+    fun sportControllerAspect(joinPoint: JoinPoint) {
+        println("sport controller")
+        Singleton.checkDBUpdate(configurationRepository, properties)
+    }
+
+    @Before("execution(* com.aitrainer.api.controller.TrackingController.*(..))")
+    fun trackingControllerAspect(joinPoint: JoinPoint) {
+        println("tracking controller")
+        Singleton.checkDBUpdate(configurationRepository, properties)
+    }
+
+    @Before("execution(* com.aitrainer.api.controller.PackageController.*(..))")
+    fun packageControllerAspect(joinPoint: JoinPoint) {
+        println("package controller")
+        Singleton.checkDBUpdate(configurationRepository, properties)
+    }
+
+    @Before("execution(* com.aitrainer.api.controller.CustomerPackageController.*(..))")
+    fun customerPackageControllerAspect(joinPoint: JoinPoint) {
+        println("customerPackage controller")
+        Singleton.checkDBUpdate(configurationRepository, properties)
+    }
+
+
+
+
 }

src/main/kotlin/com/aitrainer/api/controller/CustomerPackageController.kt

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController
 class CustomerPackageController( private val customerRepository: CustomerRepository,
                                  private val customerExerciseDeviceRepository: CustomerExerciseDeviceRepository,
                                  private val exercisesRepository: ExercisesRepository,
-                                 private val productTestRepository: ProductTestRepository,
                                  private val purchaseRepository: PurchaseRepository,
                                  private val customerPropertyRepository: CustomerPropertyRepository,
                                  private val exerciseResultRepository: ExerciseResultRepository,
@@ -44,9 +43,6 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
         val listExercises = exercisesRepository.getAllByCustomerIdOrderByDateAddDesc(customerId)
         val listExercisesJson = gson.toJson(listExercises)
 
-        val listProductTest = productTestRepository.findByCustomerId(customerId)
-        val listProductTestJson = gson.toJson(listProductTest)
-
         val listPurchase = purchaseRepository.findByCustomerId(customerId)
         val listPurchaseJson = gson.toJson(listPurchase)
 
@@ -69,7 +65,6 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
             getClassRecord(Customer::class.simpleName, customerJson) +
                     "|||" +  getClassRecord(CustomerExerciseDevice::class.simpleName, listCustomerExerciseDeviceJson) +
                     "|||" +  getClassRecord(Exercises::class.simpleName, listExercisesJson) +
-                    "|||" +  getClassRecord(ProductTest::class.simpleName, listProductTestJson) +
                     "|||" +  getClassRecord(Purchase::class.simpleName, listPurchaseJson) +
                     "|||" +  getClassRecord(CustomerProperty::class.simpleName+"All", listCustomerPropertyAllJson) +
                     "|||" +  getClassRecord(CustomerProperty::class.simpleName, listCustomerPropertyJson) +

src/main/kotlin/com/aitrainer/api/controller/PackageController.kt

@@ -26,7 +26,8 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
                         private val descriptionRepository: DescriptionRepository,
                         private val faqRepository: FaqRepository,
                         private val trainingPlanRepository: TrainingPlanRepository,
-                        private val splitTestsRepository: SplitTestsRepository
+                        private val splitTestsRepository: SplitTestsRepository,
+                        private val trainingPlanDayRepository: TrainingPlanDayRepository
 ) {
     private val logger = LoggerFactory.getLogger(javaClass)
 
@@ -83,6 +84,9 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
         val listSplitTests = splitTestsRepository.findAll()
         val listSplitTestsJson = gson.toJson(listSplitTests)
 
+        val listTrainingPlanDay = trainingPlanDayRepository.findAll()
+        val listTrainingPlanDayJson = gson.toJson(listTrainingPlanDay)
+
         val packageJson: String =
                     getClassRecord(ExerciseDevice::class.simpleName, listDevicesJson) +
            "|||" +  getClassRecord(Product::class.simpleName, listProductsJson) +
@@ -98,7 +102,8 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
            "|||" +  getClassRecord(Description::class.simpleName, listDescriptionJson) +
            "|||" +  getClassRecord(Faq::class.simpleName, listFaqJson) +
            "|||" +  getClassRecord(TrainingPlan::class.simpleName, listTrainingPlanJson) +
-           "|||" +  getClassRecord(SplitTests::class.simpleName, listSplitTestsJson)
+           "|||" +  getClassRecord(SplitTests::class.simpleName, listSplitTestsJson) +
+           "|||" +  getClassRecord(TrainingPlanDay::class.simpleName, listTrainingPlanDayJson)
 
         return if (packageJson.isEmpty()) ResponseEntity.notFound().build() else
             ResponseEntity.ok().body(packageJson)

src/main/kotlin/com/aitrainer/api/controller/ProductTestController.kt

@@ -1,32 +0,0 @@
-package com.aitrainer.api.controller
-
-import com.aitrainer.api.model.ProductTest
-import com.aitrainer.api.repository.ProductTestRepository
-import org.slf4j.LoggerFactory
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-import javax.validation.Valid
-
-@RestController
-@RequestMapping("/api")
-class ProductTestController(private val productTestRepository: ProductTestRepository) {
-    private val logger = LoggerFactory.getLogger(javaClass)
-
-    @GetMapping("/product_test/customer/{id}")
-    fun getAllByCustomerId(@PathVariable(value = "id") customerId: Long): ResponseEntity<List<ProductTest>> {
-
-        val productTestList  = productTestRepository.findByCustomerId(customerId)
-        logger.info("Get all productTest by customerId $productTestList")
-
-        return if(productTestList.isNotEmpty())
-            ResponseEntity.ok().body(productTestList) else
-            ResponseEntity.notFound().build()
-    }
-
-    @PostMapping("/product_test")
-    fun insertProductTest(@Valid @RequestBody productTest: ProductTest): ResponseEntity<ProductTest> {
-        val newProductTest = productTestRepository.save(productTest)
-        logger.info("Create new productTest: $newProductTest")
-        return ResponseEntity.ok().body(newProductTest)
-    }
-}