Mercurial > hg > LightPIT / file diff

--- a/src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt	Sat Nov 27 12:12:20 2021 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt	Sat Nov 27 13:03:57 2021 +0100
@@ -597,28 +597,27 @@
         val issueid = if (newId > 0) newId else issue.id
 
         val eventid =
-            withStatement("insert into lpit_issue_history_event(issueid, type) values (?,?::issue_history_event) returning eventid") {
+            withStatement("insert into lpit_issue_history_event(issueid, subject, type) values (?,?,?::issue_history_event) returning eventid") {
                 setInt(1, issueid)
-                setEnum(2, type)
+                setString(2, issue.subject)
+                setEnum(3, type)
                 querySingle { it.getInt(1) }!!
             }
         withStatement(
             """
-            insert into lpit_issue_history_data (component, status, category, subject, description, assignee, assignee_username, eta, affected, resolved, eventid)
-            values (?, ?::issue_status, ?::issue_category, ?, ?, ?, ?, ?, ?, ?, ?)
+            insert into lpit_issue_history_data (component, status, category, description, assignee, eta, affected, resolved, eventid)
+            values (?, ?::issue_status, ?::issue_category, ?, ?, ?, ?, ?, ?)
             """.trimIndent()
         ) {
             setStringOrNull(1, issue.component?.name)
             setEnum(2, issue.status)
             setEnum(3, issue.category)
-            setString(4, issue.subject)
-            setStringOrNull(5, issue.description)
-            setStringOrNull(6, issue.assignee?.shortDisplayname)
-            setStringOrNull(7, issue.assignee?.username)
-            setDateOrNull(8, issue.eta)
-            setStringOrNull(9, issue.affected?.name)
-            setStringOrNull(10, issue.resolved?.name)
-            setInt(11, eventid)
+            setStringOrNull(4, issue.description)
+            setStringOrNull(5, issue.assignee?.shortDisplayname)
+            setDateOrNull(6, issue.eta)
+            setStringOrNull(7, issue.affected?.name)
+            setStringOrNull(8, issue.resolved?.name)
+            setInt(9, eventid)
             executeUpdate()
         }
     }
@@ -678,17 +677,18 @@
     }
 
 
-    override fun insertHistoryEvent(issueComment: IssueComment, newId: Int) {
+    override fun insertHistoryEvent(issue: Issue, issueComment: IssueComment, newId: Int) {
         val type = if (newId > 0) IssueHistoryType.NewComment else IssueHistoryType.UpdateComment
         val commentid = if (newId > 0) newId else issueComment.id
 
         val eventid =
-            withStatement("insert into lpit_issue_history_event(issueid, type) values (?,?::issue_history_event) returning eventid") {
+            withStatement("insert into lpit_issue_history_event(issueid, subject, type) values (?,?,?::issue_history_event) returning eventid") {
                 setInt(1, issueComment.issueid)
-                setEnum(2, type)
+                setString(1, issue.subject)
+                setEnum(3, type)
                 querySingle { it.getInt(1) }!!
             }
-        withStatement("insert into lpit_issue_comment_history (commentid, eventid, comment) values (?,?,?)") {
+        withStatement("insert into lpit_issue_comment_history (commentid, eventid, comment) values (?,?,?,?)") {
             setInt(1, commentid)
             setInt(2, eventid)
             setString(3, issueComment.comment)
@@ -718,20 +718,19 @@
             queryAll { rs->
                 with(rs) {
                     IssueHistoryEntry(
-                        getTimestamp("time"),
-                        getEnum("type"),
-                        getString("current_assignee"),
-                        IssueHistoryData(getInt("issueid"),
-                            component = getString("component") ?: "",
-                            status = getEnum("status"),
-                            category = getEnum("category"),
-                            subject = getString("subject"),
-                            description = getString("description") ?: "",
-                            assignee = getString("assignee") ?: "",
-                            eta = getDate("eta"),
-                            affected = getString("affected") ?: "",
-                            resolved = getString("resolved") ?: ""
-                        )
+                        subject = getString("subject"),
+                        time = getTimestamp("time"),
+                        type = getEnum("type"),
+                        currentAssignee = getString("current_assignee"),
+                        issueid = getInt("issueid"),
+                        component = getString("component") ?: "",
+                        status = getEnum("status"),
+                        category = getEnum("category"),
+                        description = getString("description") ?: "",
+                        assignee = getString("assignee") ?: "",
+                        eta = getDate("eta"),
+                        affected = getString("affected") ?: "",
+                        resolved = getString("resolved") ?: ""
                     )
                 }
             }
@@ -755,13 +754,13 @@
             queryAll { rs->
                 with(rs) {
                     IssueCommentHistoryEntry(
-                        getTimestamp("time"),
-                        getEnum("type"),
-                        getString("current_assignee"),
-                        IssueCommentHistoryData(
-                            getInt("commentid"),
-                            getString("comment")
-                        )
+                        subject = getString("subject"),
+                        time = getTimestamp("time"),
+                        type = getEnum("type"),
+                        currentAssignee = getString("current_assignee"),
+                        issueid = getInt("issueid"),
+                        commentid = getInt("commentid"),
+                        comment = getString("comment")
                     )
                 }
             }