From 070acf4e47b04225fa4b7fbeae95aed35e816a6f Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Mon, 1 Jun 2020 09:49:12 +0200 Subject: [PATCH] customer information aspect --- data/db/install.sql | 2 ++ .../CustomerInformationController.kt | 7 ++-- .../CustomerInformationControllerAspect.kt | 35 +++++++++++++++++++ src/main/resources/application.properties | 1 + 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/main/kotlin/com/aitrainer/api/controller/CustomerInformationControllerAspect.kt diff --git a/data/db/install.sql b/data/db/install.sql index 08ac149..b64bcff 100644 --- a/data/db/install.sql +++ b/data/db/install.sql @@ -10,6 +10,8 @@ /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +use aitrainer; + -- Struktúra mentése tábla aitrainer. customer CREATE TABLE IF NOT EXISTS `customer` ( `customer_id` int(11) NOT NULL AUTO_INCREMENT, diff --git a/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationController.kt b/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationController.kt index 1a40648..a5d9882 100644 --- a/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationController.kt +++ b/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationController.kt @@ -12,7 +12,10 @@ import java.time.LocalDateTime class CustomerInformationController( private val customerInformationRepository: CustomerInformationRepository ) { @GetMapping("/customer_information") - fun getCustomerInformation(dateTime: String): List = - customerInformationRepository.findByDisplayBeginLessThanAndDisplayEndGreaterThan(dateTime, dateTime ) + fun getCustomerInformation(): List { + val dateTime: String = LocalDateTime.now().toString() + return customerInformationRepository.findByDisplayBeginLessThanAndDisplayEndGreaterThan(dateTime, dateTime ) + } + } \ No newline at end of file diff --git a/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationControllerAspect.kt b/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationControllerAspect.kt new file mode 100644 index 0000000..93b3a09 --- /dev/null +++ b/src/main/kotlin/com/aitrainer/api/controller/CustomerInformationControllerAspect.kt @@ -0,0 +1,35 @@ +package com.aitrainer.api.controller + +import com.aitrainer.api.ApiApplication +import com.aitrainer.api.repository.ConfigurationRepository +import org.aspectj.lang.annotation.Aspect +import org.aspectj.lang.annotation.Before +import org.aspectj.lang.annotation.Pointcut +import org.slf4j.LoggerFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Component + +@Aspect +@Component +@Suppress("unused") +class CustomerInformationControllerAspect { + private val logger = LoggerFactory.getLogger(ApiApplication::class.simpleName) + + @Autowired + private lateinit var configurationRepository: ConfigurationRepository + @Autowired + private lateinit var properties: ApplicationProperties + + @Suppress("unused") + @Pointcut("execution(* com.aitrainer.api.controller.CustomerInformationController.*())") + fun customerInformationAspect() { + } + + @Suppress("unused") + @Before("customerInformationAspect()") + fun dbCheckAop() { + Singleton.checkDBUpdate(configurationRepository, properties) + } + + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c5131fe..b85926c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,4 +15,5 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial logging.config=classpath:logback-spring.xml logging.file=logs +# if the database structure has been changed, increment this version number application.version=0.0.2 \ No newline at end of file