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

Sat, 04 Jun 2022 18:02:25 +0200

author
Mike Becker <universe@uap-core.de>
date
Sat, 04 Jun 2022 18:02:25 +0200
changeset 248
90dc13c78b5d
parent 247
e71ae69c68c0
child 249
6bded7090719
permissions
-rw-r--r--

simplify listIssues() interface

universe@184 1 /*
universe@184 2 * Copyright 2021 Mike Becker. All rights reserved.
universe@184 3 *
universe@184 4 * Redistribution and use in source and binary forms, with or without
universe@184 5 * modification, are permitted provided that the following conditions are met:
universe@184 6 *
universe@184 7 * 1. Redistributions of source code must retain the above copyright
universe@184 8 * notice, this list of conditions and the following disclaimer.
universe@184 9 *
universe@184 10 * 2. Redistributions in binary form must reproduce the above copyright
universe@184 11 * notice, this list of conditions and the following disclaimer in the
universe@184 12 * documentation and/or other materials provided with the distribution.
universe@184 13 *
universe@184 14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
universe@184 15 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
universe@184 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
universe@184 17 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
universe@184 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
universe@184 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
universe@184 20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
universe@184 21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
universe@184 22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
universe@184 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
universe@184 24 */
universe@184 25
universe@184 26 package de.uapcore.lightpit.servlet
universe@184 27
universe@247 28 import de.uapcore.lightpit.AbstractServlet
universe@247 29 import de.uapcore.lightpit.HttpRequest
universe@247 30 import de.uapcore.lightpit.boolValidator
universe@184 31 import de.uapcore.lightpit.dao.DataAccessObject
universe@247 32 import de.uapcore.lightpit.dateOptValidator
universe@184 33 import de.uapcore.lightpit.entities.*
universe@184 34 import de.uapcore.lightpit.types.IssueCategory
universe@184 35 import de.uapcore.lightpit.types.IssueStatus
universe@184 36 import de.uapcore.lightpit.types.VersionStatus
universe@184 37 import de.uapcore.lightpit.types.WebColor
universe@193 38 import de.uapcore.lightpit.util.IssueSorter.Companion.DEFAULT_ISSUE_SORTER
universe@184 39 import de.uapcore.lightpit.viewmodel.*
universe@184 40 import java.sql.Date
universe@184 41 import javax.servlet.annotation.WebServlet
universe@184 42
universe@184 43 @WebServlet(urlPatterns = ["/projects/*"])
universe@184 44 class ProjectServlet : AbstractServlet() {
universe@184 45
universe@184 46 init {
universe@184 47 get("/", this::projects)
universe@184 48 get("/%project", this::project)
universe@184 49 get("/%project/issues/%version/%component/", this::project)
universe@184 50 get("/%project/edit", this::projectForm)
universe@184 51 get("/-/create", this::projectForm)
universe@184 52 post("/-/commit", this::projectCommit)
universe@184 53
universe@184 54 get("/%project/versions/", this::versions)
universe@184 55 get("/%project/versions/%version/edit", this::versionForm)
universe@184 56 get("/%project/versions/-/create", this::versionForm)
universe@184 57 post("/%project/versions/-/commit", this::versionCommit)
universe@184 58
universe@184 59 get("/%project/components/", this::components)
universe@184 60 get("/%project/components/%component/edit", this::componentForm)
universe@184 61 get("/%project/components/-/create", this::componentForm)
universe@184 62 post("/%project/components/-/commit", this::componentCommit)
universe@184 63
universe@184 64 get("/%project/issues/%version/%component/%issue", this::issue)
universe@184 65 get("/%project/issues/%version/%component/%issue/edit", this::issueForm)
universe@186 66 post("/%project/issues/%version/%component/%issue/comment", this::issueComment)
universe@184 67 get("/%project/issues/%version/%component/-/create", this::issueForm)
universe@186 68 post("/%project/issues/%version/%component/-/commit", this::issueCommit)
universe@184 69 }
universe@184 70
universe@193 71 private fun projects(http: HttpRequest, dao: DataAccessObject) {
universe@184 72 val projects = dao.listProjects()
universe@184 73 val projectInfos = projects.map {
universe@184 74 ProjectInfo(
universe@184 75 project = it,
universe@184 76 versions = dao.listVersions(it),
universe@184 77 components = emptyList(), // not required in this view
universe@184 78 issueSummary = dao.collectIssueSummary(it)
universe@184 79 )
universe@184 80 }
universe@184 81
universe@184 82 with(http) {
universe@184 83 view = ProjectsView(projectInfos)
universe@184 84 navigationMenu = projectNavMenu(projects)
universe@184 85 styleSheets = listOf("projects")
universe@184 86 render("projects")
universe@184 87 }
universe@184 88 }
universe@184 89
universe@184 90 private fun activeProjectNavMenu(
universe@184 91 projects: List<Project>,
universe@184 92 projectInfo: ProjectInfo,
universe@184 93 selectedVersion: Version? = null,
universe@184 94 selectedComponent: Component? = null
universe@184 95 ) =
universe@184 96 projectNavMenu(
universe@184 97 projects,
universe@184 98 projectInfo.versions,
universe@184 99 projectInfo.components,
universe@184 100 projectInfo.project,
universe@184 101 selectedVersion,
universe@184 102 selectedComponent
universe@184 103 )
universe@184 104
universe@210 105 private sealed interface LookupResult<T>
universe@210 106 private class NotFound<T> : LookupResult<T>
universe@210 107 private data class Found<T>(val elem: T?) : LookupResult<T>
universe@184 108
universe@184 109 private fun <T : HasNode> HttpRequest.lookupPathParam(paramName: String, list: List<T>): LookupResult<T> {
universe@184 110 val node = pathParams[paramName]
universe@184 111 return if (node == null || node == "-") {
universe@210 112 Found(null)
universe@184 113 } else {
universe@184 114 val result = list.find { it.node == node }
universe@184 115 if (result == null) {
universe@210 116 NotFound()
universe@184 117 } else {
universe@210 118 Found(result)
universe@184 119 }
universe@184 120 }
universe@184 121 }
universe@184 122
universe@184 123 private fun obtainProjectInfo(http: HttpRequest, dao: DataAccessObject): ProjectInfo? {
universe@184 124 val project = dao.findProjectByNode(http.pathParams["project"] ?: "") ?: return null
universe@184 125
universe@184 126 val versions: List<Version> = dao.listVersions(project)
universe@184 127 val components: List<Component> = dao.listComponents(project)
universe@184 128
universe@184 129 return ProjectInfo(
universe@184 130 project,
universe@184 131 versions,
universe@184 132 components,
universe@184 133 dao.collectIssueSummary(project)
universe@184 134 )
universe@184 135 }
universe@184 136
universe@184 137 private fun sanitizeNode(name: String): String {
universe@184 138 val san = name.replace(Regex("[/\\\\]"), "-")
universe@184 139 return if (san.startsWith(".")) {
universe@184 140 "v$san"
universe@184 141 } else {
universe@184 142 san
universe@184 143 }
universe@184 144 }
universe@184 145
universe@198 146 private fun feedPath(project: Project) = "feed/${project.node}/issues.rss"
universe@198 147
universe@210 148 private data class PathInfos(
universe@184 149 val projectInfo: ProjectInfo,
universe@184 150 val version: Version?,
universe@184 151 val component: Component?
universe@184 152 ) {
universe@198 153 val project = projectInfo.project
universe@198 154 val issuesHref by lazyOf("projects/${project.node}/issues/${version?.node ?: "-"}/${component?.node ?: "-"}/")
universe@184 155 }
universe@184 156
universe@184 157 private fun withPathInfo(http: HttpRequest, dao: DataAccessObject): PathInfos? {
universe@184 158 val projectInfo = obtainProjectInfo(http, dao)
universe@184 159 if (projectInfo == null) {
universe@184 160 http.response.sendError(404)
universe@184 161 return null
universe@184 162 }
universe@184 163
universe@184 164 val version = when (val result = http.lookupPathParam("version", projectInfo.versions)) {
universe@210 165 is NotFound -> {
universe@184 166 http.response.sendError(404)
universe@184 167 return null
universe@184 168 }
universe@210 169 is Found -> {
universe@184 170 result.elem
universe@184 171 }
universe@184 172 }
universe@184 173 val component = when (val result = http.lookupPathParam("component", projectInfo.components)) {
universe@210 174 is NotFound -> {
universe@184 175 http.response.sendError(404)
universe@184 176 return null
universe@184 177 }
universe@210 178 is Found -> {
universe@184 179 result.elem
universe@184 180 }
universe@184 181 }
universe@184 182
universe@184 183 return PathInfos(projectInfo, version, component)
universe@184 184 }
universe@184 185
universe@193 186 private fun project(http: HttpRequest, dao: DataAccessObject) {
universe@184 187 withPathInfo(http, dao)?.run {
universe@193 188
universe@248 189 val issues = dao.listIssues(project, version, component)
universe@248 190 .sortedWith(DEFAULT_ISSUE_SORTER)
universe@184 191
universe@184 192 with(http) {
universe@205 193 pageTitle = project.name
universe@184 194 view = ProjectDetails(projectInfo, issues, version, component)
universe@198 195 feedPath = feedPath(project)
universe@184 196 navigationMenu = activeProjectNavMenu(
universe@184 197 dao.listProjects(),
universe@184 198 projectInfo,
universe@184 199 version,
universe@184 200 component
universe@184 201 )
universe@184 202 styleSheets = listOf("projects")
universe@184 203 render("project-details")
universe@184 204 }
universe@184 205 }
universe@184 206 }
universe@184 207
universe@193 208 private fun projectForm(http: HttpRequest, dao: DataAccessObject) {
universe@200 209 if (!http.pathParams.containsKey("project")) {
universe@200 210 http.view = ProjectEditView(Project(-1), dao.listUsers())
universe@200 211 http.navigationMenu = projectNavMenu(dao.listProjects())
universe@200 212 } else {
universe@200 213 val projectInfo = obtainProjectInfo(http, dao)
universe@200 214 if (projectInfo == null) {
universe@200 215 http.response.sendError(404)
universe@200 216 return
universe@200 217 }
universe@200 218 http.view = ProjectEditView(projectInfo.project, dao.listUsers())
universe@200 219 http.navigationMenu = activeProjectNavMenu(
universe@184 220 dao.listProjects(),
universe@184 221 projectInfo
universe@184 222 )
universe@184 223 }
universe@200 224 http.styleSheets = listOf("projects")
universe@200 225 http.render("project-form")
universe@184 226 }
universe@184 227
universe@193 228 private fun projectCommit(http: HttpRequest, dao: DataAccessObject) {
universe@184 229 val project = Project(http.param("id")?.toIntOrNull() ?: -1).apply {
universe@184 230 name = http.param("name") ?: ""
universe@184 231 node = http.param("node") ?: ""
universe@184 232 description = http.param("description") ?: ""
universe@184 233 ordinal = http.param("ordinal")?.toIntOrNull() ?: 0
universe@184 234 repoUrl = http.param("repoUrl") ?: ""
universe@184 235 owner = (http.param("owner")?.toIntOrNull() ?: -1).let {
universe@184 236 if (it < 0) null else dao.findUser(it)
universe@184 237 }
universe@184 238 // intentional defaults
universe@184 239 if (node.isBlank()) node = name
universe@184 240 // sanitizing
universe@184 241 node = sanitizeNode(node)
universe@184 242 }
universe@184 243
universe@184 244 if (project.id < 0) {
universe@184 245 dao.insertProject(project)
universe@184 246 } else {
universe@184 247 dao.updateProject(project)
universe@184 248 }
universe@184 249
universe@184 250 http.renderCommit("projects/${project.node}")
universe@184 251 }
universe@184 252
universe@193 253 private fun versions(http: HttpRequest, dao: DataAccessObject) {
universe@184 254 val projectInfo = obtainProjectInfo(http, dao)
universe@184 255 if (projectInfo == null) {
universe@184 256 http.response.sendError(404)
universe@184 257 return
universe@184 258 }
universe@184 259
universe@184 260 with(http) {
universe@205 261 pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.versions")}"
universe@184 262 view = VersionsView(
universe@184 263 projectInfo,
universe@184 264 dao.listVersionSummaries(projectInfo.project)
universe@184 265 )
universe@198 266 feedPath = feedPath(projectInfo.project)
universe@184 267 navigationMenu = activeProjectNavMenu(
universe@184 268 dao.listProjects(),
universe@184 269 projectInfo
universe@184 270 )
universe@184 271 styleSheets = listOf("projects")
universe@184 272 render("versions")
universe@184 273 }
universe@184 274 }
universe@184 275
universe@193 276 private fun versionForm(http: HttpRequest, dao: DataAccessObject) {
universe@184 277 val projectInfo = obtainProjectInfo(http, dao)
universe@184 278 if (projectInfo == null) {
universe@184 279 http.response.sendError(404)
universe@184 280 return
universe@184 281 }
universe@184 282
universe@184 283 val version: Version
universe@184 284 when (val result = http.lookupPathParam("version", projectInfo.versions)) {
universe@210 285 is NotFound -> {
universe@184 286 http.response.sendError(404)
universe@184 287 return
universe@184 288 }
universe@210 289 is Found -> {
universe@184 290 version = result.elem ?: Version(-1, projectInfo.project.id)
universe@184 291 }
universe@184 292 }
universe@184 293
universe@184 294 with(http) {
universe@184 295 view = VersionEditView(projectInfo, version)
universe@198 296 feedPath = feedPath(projectInfo.project)
universe@184 297 navigationMenu = activeProjectNavMenu(
universe@184 298 dao.listProjects(),
universe@184 299 projectInfo,
universe@184 300 selectedVersion = version
universe@184 301 )
universe@184 302 styleSheets = listOf("projects")
universe@184 303 render("version-form")
universe@184 304 }
universe@184 305 }
universe@184 306
universe@210 307 private fun obtainIdAndProject(http: HttpRequest, dao:DataAccessObject): Pair<Int, Project>? {
universe@184 308 val id = http.param("id")?.toIntOrNull()
universe@184 309 val projectid = http.param("projectid")?.toIntOrNull() ?: -1
universe@184 310 val project = dao.findProject(projectid)
universe@210 311 return if (id == null || project == null) {
universe@184 312 http.response.sendError(400)
universe@210 313 null
universe@210 314 } else {
universe@210 315 Pair(id, project)
universe@184 316 }
universe@210 317 }
universe@184 318
universe@210 319 private fun versionCommit(http: HttpRequest, dao: DataAccessObject) {
universe@210 320 val idParams = obtainIdAndProject(http, dao) ?: return
universe@210 321 val (id, project) = idParams
universe@210 322
universe@210 323 val version = Version(id, project.id).apply {
universe@184 324 name = http.param("name") ?: ""
universe@184 325 node = http.param("node") ?: ""
universe@184 326 ordinal = http.param("ordinal")?.toIntOrNull() ?: 0
universe@184 327 status = http.param("status")?.let(VersionStatus::valueOf) ?: VersionStatus.Future
universe@225 328 // TODO: process error messages
universe@225 329 eol = http.param("eol", ::dateOptValidator, null, mutableListOf())
universe@225 330 release = http.param("release", ::dateOptValidator, null, mutableListOf())
universe@184 331 // intentional defaults
universe@184 332 if (node.isBlank()) node = name
universe@184 333 // sanitizing
universe@184 334 node = sanitizeNode(node)
universe@184 335 }
universe@184 336
universe@225 337 // sanitize eol and release date
universe@225 338 if (version.status.isEndOfLife) {
universe@225 339 if (version.eol == null) version.eol = Date(System.currentTimeMillis())
universe@225 340 } else if (version.status.isReleased) {
universe@225 341 if (version.release == null) version.release = Date(System.currentTimeMillis())
universe@225 342 }
universe@225 343
universe@184 344 if (id < 0) {
universe@184 345 dao.insertVersion(version)
universe@184 346 } else {
universe@184 347 dao.updateVersion(version)
universe@184 348 }
universe@184 349
universe@184 350 http.renderCommit("projects/${project.node}/versions/")
universe@184 351 }
universe@184 352
universe@193 353 private fun components(http: HttpRequest, dao: DataAccessObject) {
universe@184 354 val projectInfo = obtainProjectInfo(http, dao)
universe@184 355 if (projectInfo == null) {
universe@184 356 http.response.sendError(404)
universe@184 357 return
universe@184 358 }
universe@184 359
universe@184 360 with(http) {
universe@205 361 pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.components")}"
universe@184 362 view = ComponentsView(
universe@184 363 projectInfo,
universe@184 364 dao.listComponentSummaries(projectInfo.project)
universe@184 365 )
universe@198 366 feedPath = feedPath(projectInfo.project)
universe@184 367 navigationMenu = activeProjectNavMenu(
universe@184 368 dao.listProjects(),
universe@184 369 projectInfo
universe@184 370 )
universe@184 371 styleSheets = listOf("projects")
universe@184 372 render("components")
universe@184 373 }
universe@184 374 }
universe@184 375
universe@193 376 private fun componentForm(http: HttpRequest, dao: DataAccessObject) {
universe@184 377 val projectInfo = obtainProjectInfo(http, dao)
universe@184 378 if (projectInfo == null) {
universe@184 379 http.response.sendError(404)
universe@184 380 return
universe@184 381 }
universe@184 382
universe@184 383 val component: Component
universe@184 384 when (val result = http.lookupPathParam("component", projectInfo.components)) {
universe@210 385 is NotFound -> {
universe@184 386 http.response.sendError(404)
universe@184 387 return
universe@184 388 }
universe@210 389 is Found -> {
universe@184 390 component = result.elem ?: Component(-1, projectInfo.project.id)
universe@184 391 }
universe@184 392 }
universe@184 393
universe@184 394 with(http) {
universe@184 395 view = ComponentEditView(projectInfo, component, dao.listUsers())
universe@198 396 feedPath = feedPath(projectInfo.project)
universe@184 397 navigationMenu = activeProjectNavMenu(
universe@184 398 dao.listProjects(),
universe@184 399 projectInfo,
universe@184 400 selectedComponent = component
universe@184 401 )
universe@184 402 styleSheets = listOf("projects")
universe@184 403 render("component-form")
universe@184 404 }
universe@184 405 }
universe@184 406
universe@193 407 private fun componentCommit(http: HttpRequest, dao: DataAccessObject) {
universe@210 408 val idParams = obtainIdAndProject(http, dao) ?: return
universe@210 409 val (id, project) = idParams
universe@184 410
universe@210 411 val component = Component(id, project.id).apply {
universe@184 412 name = http.param("name") ?: ""
universe@184 413 node = http.param("node") ?: ""
universe@184 414 ordinal = http.param("ordinal")?.toIntOrNull() ?: 0
universe@184 415 color = WebColor(http.param("color") ?: "#000000")
universe@184 416 description = http.param("description")
universe@227 417 // TODO: process error message
universe@227 418 active = http.param("active", ::boolValidator, true, mutableListOf())
universe@184 419 lead = (http.param("lead")?.toIntOrNull() ?: -1).let {
universe@184 420 if (it < 0) null else dao.findUser(it)
universe@184 421 }
universe@184 422 // intentional defaults
universe@184 423 if (node.isBlank()) node = name
universe@184 424 // sanitizing
universe@184 425 node = sanitizeNode(node)
universe@184 426 }
universe@184 427
universe@184 428 if (id < 0) {
universe@184 429 dao.insertComponent(component)
universe@184 430 } else {
universe@184 431 dao.updateComponent(component)
universe@184 432 }
universe@184 433
universe@184 434 http.renderCommit("projects/${project.node}/components/")
universe@184 435 }
universe@184 436
universe@193 437 private fun issue(http: HttpRequest, dao: DataAccessObject) {
universe@184 438 withPathInfo(http, dao)?.run {
universe@184 439 val issue = dao.findIssue(http.pathParams["issue"]?.toIntOrNull() ?: -1)
universe@184 440 if (issue == null) {
universe@184 441 http.response.sendError(404)
universe@184 442 return
universe@184 443 }
universe@184 444
universe@184 445 val comments = dao.listComments(issue)
universe@184 446
universe@184 447 with(http) {
universe@205 448 pageTitle = "${projectInfo.project.name}: #${issue.id} ${issue.subject}"
universe@198 449 view = IssueDetailView(issue, comments, project, version, component)
universe@198 450 feedPath = feedPath(projectInfo.project)
universe@184 451 navigationMenu = activeProjectNavMenu(
universe@184 452 dao.listProjects(),
universe@184 453 projectInfo,
universe@184 454 version,
universe@184 455 component
universe@184 456 )
universe@184 457 styleSheets = listOf("projects")
universe@207 458 javascript = "issue-editor"
universe@184 459 render("issue-view")
universe@184 460 }
universe@184 461 }
universe@184 462 }
universe@184 463
universe@193 464 private fun issueForm(http: HttpRequest, dao: DataAccessObject) {
universe@184 465 withPathInfo(http, dao)?.run {
universe@184 466 val issue = dao.findIssue(http.pathParams["issue"]?.toIntOrNull() ?: -1) ?: Issue(
universe@184 467 -1,
universe@198 468 project,
universe@184 469 )
universe@184 470
universe@215 471 // for new issues set some defaults
universe@215 472 if (issue.id < 0) {
universe@215 473 // pre-select component, if available in the path info
universe@215 474 issue.component = component
universe@184 475
universe@215 476 // pre-select version, if available in the path info
universe@215 477 if (version != null) {
universe@215 478 if (version.status.isReleased) {
universe@231 479 issue.affected = version
universe@215 480 } else {
universe@231 481 issue.resolved = version
universe@215 482 }
universe@191 483 }
universe@191 484 }
universe@191 485
universe@184 486 with(http) {
universe@184 487 view = IssueEditView(
universe@184 488 issue,
universe@184 489 projectInfo.versions,
universe@184 490 projectInfo.components,
universe@184 491 dao.listUsers(),
universe@198 492 project,
universe@184 493 version,
universe@184 494 component
universe@184 495 )
universe@198 496 feedPath = feedPath(projectInfo.project)
universe@184 497 navigationMenu = activeProjectNavMenu(
universe@184 498 dao.listProjects(),
universe@184 499 projectInfo,
universe@184 500 version,
universe@184 501 component
universe@184 502 )
universe@184 503 styleSheets = listOf("projects")
universe@207 504 javascript = "issue-editor"
universe@184 505 render("issue-form")
universe@184 506 }
universe@184 507 }
universe@184 508 }
universe@184 509
universe@193 510 private fun issueComment(http: HttpRequest, dao: DataAccessObject) {
universe@184 511 withPathInfo(http, dao)?.run {
universe@184 512 val issue = dao.findIssue(http.pathParams["issue"]?.toIntOrNull() ?: -1)
universe@184 513 if (issue == null) {
universe@184 514 http.response.sendError(404)
universe@184 515 return
universe@184 516 }
universe@184 517
universe@207 518 val commentId = http.param("commentid")?.toIntOrNull() ?: -1
universe@207 519 if (commentId > 0) {
universe@207 520 val comment = dao.findComment(commentId)
universe@232 521 if (comment == null) {
universe@232 522 http.response.sendError(404)
universe@232 523 return
universe@232 524 }
universe@232 525 val originalAuthor = comment.author?.username
universe@207 526 if (originalAuthor != null && originalAuthor == http.remoteUser) {
universe@232 527 val newComment = http.param("comment")
universe@232 528 if (!newComment.isNullOrBlank()) {
universe@232 529 comment.comment = newComment
universe@232 530 dao.updateComment(comment)
universe@242 531 dao.insertHistoryEvent(issue, comment)
universe@232 532 } else {
universe@247 533 logger.debug("Not updating comment ${comment.id} because nothing changed.")
universe@232 534 }
universe@207 535 } else {
universe@207 536 http.response.sendError(403)
universe@207 537 return
universe@207 538 }
universe@207 539 } else {
universe@207 540 val comment = IssueComment(-1, issue.id).apply {
universe@207 541 author = http.remoteUser?.let { dao.findUserByName(it) }
universe@207 542 comment = http.param("comment") ?: ""
universe@207 543 }
universe@232 544 val newId = dao.insertComment(comment)
universe@242 545 dao.insertHistoryEvent(issue, comment, newId)
universe@184 546 }
universe@184 547
universe@184 548 http.renderCommit("${issuesHref}${issue.id}")
universe@184 549 }
universe@184 550 }
universe@184 551
universe@193 552 private fun issueCommit(http: HttpRequest, dao: DataAccessObject) {
universe@184 553 withPathInfo(http, dao)?.run {
universe@184 554 val issue = Issue(
universe@184 555 http.param("id")?.toIntOrNull() ?: -1,
universe@198 556 project
universe@184 557 ).apply {
universe@184 558 component = dao.findComponent(http.param("component")?.toIntOrNull() ?: -1)
universe@184 559 category = IssueCategory.valueOf(http.param("category") ?: "")
universe@184 560 status = IssueStatus.valueOf(http.param("status") ?: "")
universe@184 561 subject = http.param("subject") ?: ""
universe@184 562 description = http.param("description") ?: ""
universe@184 563 assignee = http.param("assignee")?.toIntOrNull()?.let {
universe@184 564 when (it) {
universe@184 565 -1 -> null
universe@184 566 -2 -> component?.lead
universe@184 567 else -> dao.findUser(it)
universe@184 568 }
universe@184 569 }
universe@225 570 // TODO: process error messages
universe@225 571 eta = http.param("eta", ::dateOptValidator, null, mutableListOf())
universe@184 572
universe@231 573 affected = http.param("affected")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) }
universe@231 574 resolved = http.param("resolved")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) }
universe@184 575 }
universe@184 576
universe@186 577 val openId = if (issue.id < 0) {
universe@232 578 val id = dao.insertIssue(issue)
universe@232 579 dao.insertHistoryEvent(issue, id)
universe@232 580 id
universe@186 581 } else {
universe@232 582 val reference = dao.findIssue(issue.id)
universe@232 583 if (reference == null) {
universe@232 584 http.response.sendError(404)
universe@232 585 return
universe@232 586 }
universe@232 587
universe@232 588 if (issue.hasChanged(reference)) {
universe@232 589 dao.updateIssue(issue)
universe@232 590 dao.insertHistoryEvent(issue)
universe@232 591 } else {
universe@247 592 logger.debug("Not updating issue ${issue.id} because nothing changed.")
universe@232 593 }
universe@232 594
universe@214 595 val newComment = http.param("comment")
universe@214 596 if (!newComment.isNullOrBlank()) {
universe@232 597 val comment = IssueComment(-1, issue.id).apply {
universe@214 598 author = http.remoteUser?.let { dao.findUserByName(it) }
universe@214 599 comment = newComment
universe@232 600 }
universe@232 601 val commentid = dao.insertComment(comment)
universe@242 602 dao.insertHistoryEvent(issue, comment, commentid)
universe@214 603 }
universe@186 604 issue.id
universe@186 605 }
universe@186 606
universe@186 607 if (http.param("more") != null) {
universe@185 608 http.renderCommit("${issuesHref}-/create")
universe@185 609 } else {
universe@186 610 http.renderCommit("${issuesHref}${openId}")
universe@185 611 }
universe@184 612 }
universe@184 613 }
universe@184 614 }

mercurial