From 1d301c64b67d19cde01a7cab64852b5115bacce4 Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Wed, 18 Dec 2019 19:47:03 +0400
Subject: [PATCH] Timestamps, fixed user action type.
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
.../s3ai/corporate_app2/controllers/UsersController.kt | 1 -
.../com/s3ai/corporate_app2/jms/persistance/entities.kt | 8 ++++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt b/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt
index 6c09ff7..591e24d 100644
--- a/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt
+++ b/src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt
@@ -31,7 +31,6 @@ class UsersController {
val user: User?
if (id.isEmpty()) {
user = User()
- user.id = UUID.randomUUID()
model.addAttribute("action", "Create")
} else {
user = userService.findById(UUID.fromString(id))
diff --git a/src/main/kotlin/com/s3ai/corporate_app2/jms/persistance/entities.kt b/src/main/kotlin/com/s3ai/corporate_app2/jms/persistance/entities.kt
index 2b411a5..5c221cd 100644
--- a/src/main/kotlin/com/s3ai/corporate_app2/jms/persistance/entities.kt
+++ b/src/main/kotlin/com/s3ai/corporate_app2/jms/persistance/entities.kt
@@ -1,11 +1,14 @@
package com.s3ai.corporate_app2.jms.persistance
import com.fasterxml.jackson.annotation.JsonAutoDetect
+import org.hibernate.annotations.CreationTimestamp
import org.hibernate.annotations.OnDelete
import org.hibernate.annotations.OnDeleteAction
+import java.time.LocalDateTime
import java.util.*
import javax.persistence.*
+
enum class JMSEntityAction(val str: String) {
UPDATE("updated"),
QUERY("queried"),
@@ -28,6 +31,8 @@ class JMSAction {
lateinit var entity: String
@Column(name = "description", columnDefinition = "TEXT")
lateinit var actionDescription: String
+ @CreationTimestamp
+ private val createDateTime: LocalDateTime? = null
@Column(name = "delivered")
var delivered: Boolean = true
@@ -46,6 +51,9 @@ class Subscriber {
@Column(name = "email")
var email: String? = null
+ @CreationTimestamp
+ private val createDateTime: LocalDateTime? = null
+
@OneToMany
var types: List<SubscriptionType> = mutableListOf()
}
--
GitLab