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

Sat, 04 Jun 2022 18:29:58 +0200

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

move IssueSorter to viewmodel package

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

mercurial