LightPIT: comparison src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt

-:1ca4f27cefe8
+:b7f3e972b13c
 import com.github.difflib.text.DiffRow
 import com.github.difflib.text.DiffRowGenerator
 import de.uapcore.lightpit.AbstractServlet
 import de.uapcore.lightpit.HttpRequest
 import de.uapcore.lightpit.dao.DataAccessObject
-import de.uapcore.lightpit.entities.IssueHistoryData
+import de.uapcore.lightpit.entities.IssueCommentHistoryEntry
 import de.uapcore.lightpit.entities.IssueHistoryEntry
+import de.uapcore.lightpit.types.IssueHistoryType
+import de.uapcore.lightpit.viewmodel.CommentDiff
 import de.uapcore.lightpit.viewmodel.IssueDiff
 import de.uapcore.lightpit.viewmodel.IssueFeed
 import de.uapcore.lightpit.viewmodel.IssueFeedEntry
 import java.text.SimpleDateFormat
 import javax.servlet.annotation.WebServlet
 init {
 get("/%project/issues.rss", this::issues)
 }
-private fun fullContent(issue: IssueHistoryData) = IssueDiff(
+val diffGenerator by lazyOf(DiffRowGenerator.create()
-issue.id,
+.showInlineDiffs(true)
+.mergeOriginalRevised(true)
+.inlineDiffByWord(true)
+.oldTag { start -> if (start) "<strike style=\"color:red\">" else "</strike>" }
+.newTag { start -> if (start) "<i style=\"color: green\">" else "</i>" }
+.build()
+)
+private fun fullContent(data: IssueCommentHistoryEntry) =
+CommentDiff(
+data.issueid,
+data.commentid,
+data.subject,
+data.comment.replace("\r", "")
+)
+private fun diffContent(cur: IssueCommentHistoryEntry, next: IssueCommentHistoryEntry) =
+CommentDiff(
+cur.issueid,
+cur.commentid,
+cur.subject,
+diffGenerator.generateDiffRows(
+next.comment.replace("\r", "").split('\n'),
+cur.comment.replace("\r", "").split('\n')
+).joinToString("\n", transform = DiffRow::getOldLine)
+)
+private fun fullContent(issue: IssueHistoryEntry) = IssueDiff(
+issue.issueid,
 issue.subject,
 issue.component,
 issue.status.name,
 issue.category.name,
 issue.subject,
 issue.eta?.let { SimpleDateFormat("dd.MM.yyyy").format(it) } ?: "",
 issue.affected,
 issue.resolved
 )
-private fun diffContent(cur: IssueHistoryData, next: IssueHistoryData): IssueDiff {
+private fun diffContent(cur: IssueHistoryEntry, next: IssueHistoryEntry): IssueDiff {
-val generator = DiffRowGenerator.create()
-.showInlineDiffs(true)
-.mergeOriginalRevised(true)
-.inlineDiffByWord(true)
-.oldTag { start -> if (start) "<strike style=\"color:red\">" else "</strike>" }
-.newTag { start -> if (start) "<i style=\"color: green\">" else "</i>" }
-.build()
 val prev = fullContent(next)
 val diff = fullContent(cur)
+val result = diffGenerator.generateDiffRows(
-val result = generator.generateDiffRows(
 listOf(
 prev.subject, prev.component, prev.status,
 prev.category, prev.assignee, prev.eta, prev.affected, prev.resolved
 ),
 listOf(
 diff.assignee = result[4].oldLine
 diff.eta = result[5].oldLine
 diff.affected = result[6].oldLine
 diff.resolved = result[7].oldLine
-diff.description = generator.generateDiffRows(
+diff.description = diffGenerator.generateDiffRows(
 prev.description.split('\n'),
 diff.description.split('\n')
 ).joinToString("\n", transform = DiffRow::getOldLine)
 return diff
 }
 /**
 * Generates the feed entries.
-* Assumes that [historyEntry] is already sorted by timestamp (descending).
+* Assumes that [issueEntries] and [commentEntries] are already sorted by timestamp (descending).
 */
-private fun generateFeedEntries(historyEntry: List<IssueHistoryEntry>): List<IssueFeedEntry> =
+private fun generateFeedEntries(
-if (historyEntry.isEmpty()) {
+issueEntries: List<IssueHistoryEntry>,
+commentEntries: List<IssueCommentHistoryEntry>
+): List<IssueFeedEntry> =
+(generateIssueFeedEntries(issueEntries) + generateCommentFeedEntries(commentEntries)).sortedByDescending { it.time }
+private fun generateIssueFeedEntries(entries: List<IssueHistoryEntry>): List<IssueFeedEntry> =
+if (entries.isEmpty()) {
 emptyList()
 } else {
-historyEntry.groupBy { it.data.id }.mapValues { (_, history) ->
+entries.groupBy { it.issueid }.mapValues { (_, history) ->
 history.zipWithNext().map { (cur, next) ->
 IssueFeedEntry(
-cur.time, cur.type, diffContent(cur.data, next.data)
+cur.time, cur.type, issue = diffContent(cur, next)
 )
 }.plus(
-history.last().let { IssueFeedEntry(it.time, it.type, fullContent(it.data)) }
+history.last().let { IssueFeedEntry(it.time, it.type, issue = fullContent(it)) }
 )
-}.flatMap { it.value }.sortedByDescending { it.time }
+}.flatMap { it.value }
+}
+private fun generateCommentFeedEntries(entries: List<IssueCommentHistoryEntry>): List<IssueFeedEntry> =
+if (entries.isEmpty()) {
+emptyList()
+} else {
+entries.groupBy { it.commentid }.mapValues { (_, history) ->
+history.zipWithNext().map { (cur, next) ->
+IssueFeedEntry(
+cur.time, cur.type, comment = diffContent(cur, next)
+)
+}.plus(
+history.last().let { IssueFeedEntry(it.time, it.type, comment = fullContent(it)) }
+)
+}.flatMap { it.value }
 }
 private fun issues(http: HttpRequest, dao: DataAccessObject) {
 val project = http.pathParams["project"]?.let { dao.findProjectByNode(it) }
 if (project == null) {
 http.response.sendError(404)
 return
 }
 val assignees = http.param("assignee")?.split(',')
+val comments = http.param("comments") ?: "all"
 val days = http.param("days")?.toIntOrNull() ?: 30
 val issuesFromDb = dao.listIssueHistory(project.id, days)
 val issueHistory = if (assignees == null) issuesFromDb else
 issuesFromDb.filter { assignees.contains(it.currentAssignee) }
-// TODO: add comment history depending on parameter
+val commentsFromDb = dao.listIssueCommentHistory(project.id, days)
+val commentHistory = when (comments) {
+"all" -> commentsFromDb
+"new" -> commentsFromDb.filter { it.type == IssueHistoryType.NewComment }
+else -> emptyList()
+}
-http.view = IssueFeed(project, generateFeedEntries(issueHistory))
+http.view = IssueFeed(project, generateFeedEntries(issueHistory, commentHistory))
 http.renderFeed("issues-feed")
 }
 }

Mercurial > hg > LightPIT / file comparison

comparison: src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt

src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt