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

Tue, 30 Jul 2024 18:53:39 +0200

author
Mike Becker <universe@uap-core.de>
date
Tue, 30 Jul 2024 18:53:39 +0200
changeset 307
23fe9f174d2d
parent 306
1ab9f65e683e
child 311
bf67e0ff7131
permissions
-rw-r--r--

add filter for assignee - fixes #403

184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * Copyright 2021 Mike Becker. All rights reserved.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Redistribution and use in source and binary forms, with or without
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 * modification, are permitted provided that the following conditions are met:
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * 1. Redistributions of source code must retain the above copyright
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 * notice, this list of conditions and the following disclaimer.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * 2. Redistributions in binary form must reproduce the above copyright
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 * notice, this list of conditions and the following disclaimer in the
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * documentation and/or other materials provided with the distribution.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 *
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 */
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 package de.uapcore.lightpit.servlet
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
28 import de.uapcore.lightpit.*
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 import de.uapcore.lightpit.dao.DataAccessObject
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30 import de.uapcore.lightpit.entities.*
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
31 import de.uapcore.lightpit.types.*
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
32 import de.uapcore.lightpit.viewmodel.*
254
55ca6cafc3dd #233 migrate to Jakarta EE and update dependencies
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
33 import jakarta.servlet.annotation.WebServlet
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
34 import java.sql.Date
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
35
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
36 @WebServlet(urlPatterns = ["/projects/*"])
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
37 class ProjectServlet : AbstractServlet() {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
38
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
39 init {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
40 get("/", this::projects)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
41 get("/%project", this::project)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
42 get("/%project/issues/%version/%component/", this::project)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
43 get("/%project/edit", this::projectForm)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
44 get("/-/create", this::projectForm)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
45 post("/-/commit", this::projectCommit)
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
46 post("/%project/vcs/analyze", this::vcsAnalyze)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
47
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
48 get("/%project/versions/", this::versions)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
49 get("/%project/versions/%version/edit", this::versionForm)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
50 get("/%project/versions/-/create", this::versionForm)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
51 post("/%project/versions/-/commit", this::versionCommit)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
52
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
53 get("/%project/components/", this::components)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
54 get("/%project/components/%component/edit", this::componentForm)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
55 get("/%project/components/-/create", this::componentForm)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
56 post("/%project/components/-/commit", this::componentCommit)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
57
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
58 get("/%project/issues/%version/%component/%issue", this::issue)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
59 get("/%project/issues/%version/%component/%issue/edit", this::issueForm)
186
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
60 post("/%project/issues/%version/%component/%issue/comment", this::issueComment)
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
61 post("/%project/issues/%version/%component/%issue/relation", this::issueRelation)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
62 get("/%project/issues/%version/%component/%issue/removeRelation", this::issueRemoveRelation)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
63 get("/%project/issues/%version/%component/-/create", this::issueForm)
186
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
64 post("/%project/issues/%version/%component/-/commit", this::issueCommit)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
65 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
66
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
67 private fun projects(http: HttpRequest, dao: DataAccessObject) {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
68 val projects = dao.listProjects()
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
69 val projectInfos = projects.map {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
70 ProjectInfo(
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
71 project = it,
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
72 versions = dao.listVersions(it),
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
73 components = emptyList(), // not required in this view
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
74 issueSummary = dao.collectIssueSummary(it)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
75 )
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
76 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
77
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
78 with(http) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
79 view = ProjectsView(projectInfos)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
80 navigationMenu = projectNavMenu(projects)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
81 styleSheets = listOf("projects")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
82 render("projects")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
83 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
84 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
85
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
86 private fun sanitizeNode(name: String): String {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
87 val san = name.replace(Regex("[/\\\\]"), "-")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
88 return if (san.startsWith(".")) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
89 "v$san"
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
90 } else {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
91 san
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
92 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
93 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
94
198
94f174d591ab fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents: 193
diff changeset
95 private fun feedPath(project: Project) = "feed/${project.node}/issues.rss"
94f174d591ab fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents: 193
diff changeset
96
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
97 private fun project(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
98 withPathInfo(http, dao)?.let {path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
99 val project = path.projectInfo.project
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
100
268
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
101 val filter = IssueFilter(http)
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
102
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
103 val needRelationsMap = filter.onlyBlocker
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
104
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
105 val relationsMap = if (needRelationsMap) dao.getIssueRelationMap(project, filter.includeDone) else emptyMap()
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
106
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
107 val specificVersion = path.versionInfo !is OptionalPathInfo.All
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
108 val version = if (path.versionInfo is OptionalPathInfo.Specific) path.versionInfo.elem else null
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
109 val specificComponent = path.componentInfo !is OptionalPathInfo.All
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
110 val component = if (path.componentInfo is OptionalPathInfo.Specific) path.componentInfo.elem else null
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
111
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
112 val issues = dao.listIssues(project, filter.includeDone, specificVersion, version, specificComponent, component)
271
f8f5e82944fa #15 add sort options
Mike Becker <universe@uap-core.de>
parents: 268
diff changeset
113 .sortedWith(IssueSorter(filter.sortPrimary, filter.sortSecondary, filter.sortTertiary))
268
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
114 .filter {
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
115 (!filter.onlyMine || (it.assignee?.username ?: "") == (http.remoteUser ?: "<Anonymous>")) &&
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
116 (!filter.onlyBlocker || (relationsMap[it.id]?.any { (_,type) -> type.blocking }?:false)) &&
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
117 (filter.status.isEmpty() || filter.status.contains(it.status)) &&
307
23fe9f174d2d add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents: 306
diff changeset
118 (filter.category.isEmpty() || filter.category.contains(it.category)) &&
23fe9f174d2d add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents: 306
diff changeset
119 (filter.onlyMine || filter.assignee.isEmpty() || filter.assignee.contains(it.assignee?.id ?: -1))
268
ca5501d851fa #15 add issue filters
Mike Becker <universe@uap-core.de>
parents: 267
diff changeset
120 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
121
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
122 with(http) {
205
7725a79416f3 #115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents: 200
diff changeset
123 pageTitle = project.name
307
23fe9f174d2d add filter for assignee - fixes #403
Mike Becker <universe@uap-core.de>
parents: 306
diff changeset
124 view = ProjectDetails(path, issues, filter, dao.listUsers().sortedBy(User::shortDisplayname))
198
94f174d591ab fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents: 193
diff changeset
125 feedPath = feedPath(project)
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
126 navigationMenu = projectNavMenu(dao.listProjects(), path)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
127 styleSheets = listOf("projects")
266
65c72e65ff67 simplify project-details view
Mike Becker <universe@uap-core.de>
parents: 265
diff changeset
128 javascript = "project-details"
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
129 render("project-details")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
130 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
131 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
132 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
133
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
134 private fun projectForm(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
135 http.styleSheets = listOf("projects")
200
a5ddfaf6b469 fixes project creation not working
Mike Becker <universe@uap-core.de>
parents: 198
diff changeset
136 if (!http.pathParams.containsKey("project")) {
a5ddfaf6b469 fixes project creation not working
Mike Becker <universe@uap-core.de>
parents: 198
diff changeset
137 http.view = ProjectEditView(Project(-1), dao.listUsers())
a5ddfaf6b469 fixes project creation not working
Mike Becker <universe@uap-core.de>
parents: 198
diff changeset
138 http.navigationMenu = projectNavMenu(dao.listProjects())
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
139 http.render("project-form")
200
a5ddfaf6b469 fixes project creation not working
Mike Becker <universe@uap-core.de>
parents: 198
diff changeset
140 } else {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
141 withPathInfo(http, dao)?.let { path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
142 http.view = ProjectEditView(path.projectInfo.project, dao.listUsers())
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
143 http.navigationMenu = projectNavMenu(dao.listProjects(), path)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
144 http.render("project-form")
200
a5ddfaf6b469 fixes project creation not working
Mike Becker <universe@uap-core.de>
parents: 198
diff changeset
145 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
146 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
147 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
148
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
149 private fun projectCommit(http: HttpRequest, dao: DataAccessObject) {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
150 val project = Project(http.param("id")?.toIntOrNull() ?: -1).apply {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
151 name = http.param("name") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
152 node = http.param("node") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
153 description = http.param("description") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
154 ordinal = http.param("ordinal")?.toIntOrNull() ?: 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
155 repoUrl = http.param("repoUrl") ?: ""
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
156 vcs = VcsType.valueOf(http.param("vcs") ?: "None")
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
157 owner = (http.param("owner")?.toIntOrNull() ?: -1).let {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
158 if (it < 0) null else dao.findUser(it)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
159 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
160 // intentional defaults
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
161 if (node.isBlank()) node = name
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
162 // sanitizing
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
163 node = sanitizeNode(node)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
164 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
165
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
166 if (project.id < 0) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
167 dao.insertProject(project)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
168 } else {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
169 dao.updateProject(project)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
170 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
171
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
172 http.renderCommit("projects/${project.node}")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
173 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
174
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
175 private fun vcsAnalyze(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
176 withPathInfo(http, dao)?.let { path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
177 // if analysis is not configured, reject the request
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
178 if (path.projectInfo.project.vcs == VcsType.None) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
179 http.response.sendError(404)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
180 return
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
181 }
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
182
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
183 // obtain the list of issues for this project to filter cross-project references
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
184 val knownIds = dao.listIssues(path.projectInfo.project, true).map { it.id }
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
185
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
186 // read the provided commit log and merge only the refs that relate issues from the current project
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
187 dao.mergeCommitRefs(parseCommitRefs(http.body).filter { knownIds.contains(it.issueId) })
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
188 }
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
189 }
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
190
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
191 private fun versions(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
192 withPathInfo(http, dao)?.let { path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
193 with(http) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
194 pageTitle = "${path.projectInfo.project.name} - ${i18n("navmenu.versions")}"
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
195 view = VersionsView(
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
196 path.projectInfo,
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
197 dao.listVersionSummaries(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
198 )
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
199 feedPath = feedPath(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
200 navigationMenu = projectNavMenu(dao.listProjects(), path)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
201 styleSheets = listOf("projects")
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
202 javascript = "project-details"
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
203 render("versions")
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
204 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
205 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
206 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
207
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
208 private fun versionForm(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
209 withPathInfo(http, dao)?.let { path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
210 val version = if (path.versionInfo is OptionalPathInfo.Specific)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
211 path.versionInfo.elem else Version(-1, path.projectInfo.project.id)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
212
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
213 with(http) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
214 view = VersionEditView(path.projectInfo, version)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
215 feedPath = feedPath(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
216 navigationMenu = projectNavMenu(dao.listProjects(), path)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
217 styleSheets = listOf("projects")
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
218 render("version-form")
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
219 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
220 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
221 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
222
249
6bded7090719 move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents: 248
diff changeset
223 private fun obtainIdAndProject(http: HttpRequest, dao: DataAccessObject): Pair<Int, Project>? {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
224 val id = http.param("id")?.toIntOrNull()
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
225 val projectid = http.param("projectid")?.toIntOrNull() ?: -1
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
226 val project = dao.findProject(projectid)
210
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
227 return if (id == null || project == null) {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
228 http.response.sendError(400)
210
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
229 null
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
230 } else {
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
231 Pair(id, project)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
232 }
210
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
233 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
234
210
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
235 private fun versionCommit(http: HttpRequest, dao: DataAccessObject) {
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
236 val idParams = obtainIdAndProject(http, dao) ?: return
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
237 val (id, project) = idParams
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
238
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
239 val version = Version(id, project.id).apply {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
240 name = http.param("name") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
241 node = http.param("node") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
242 ordinal = http.param("ordinal")?.toIntOrNull() ?: 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
243 status = http.param("status")?.let(VersionStatus::valueOf) ?: VersionStatus.Future
225
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
244 // TODO: process error messages
249
6bded7090719 move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents: 248
diff changeset
245 eol = http.param("eol", ::dateOptValidator, null, mutableListOf())
6bded7090719 move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents: 248
diff changeset
246 release = http.param("release", ::dateOptValidator, null, mutableListOf())
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
247 // intentional defaults
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
248 if (node.isBlank()) node = name
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
249 // sanitizing
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
250 node = sanitizeNode(node)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
251 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
252
225
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
253 // sanitize eol and release date
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
254 if (version.status.isEndOfLife) {
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
255 if (version.eol == null) version.eol = Date(System.currentTimeMillis())
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
256 } else if (version.status.isReleased) {
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
257 if (version.release == null) version.release = Date(System.currentTimeMillis())
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
258 }
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
259
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
260 if (id < 0) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
261 dao.insertVersion(version)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
262 } else {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
263 dao.updateVersion(version)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
264 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
265
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
266 http.renderCommit("projects/${project.node}/versions/")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
267 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
268
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
269 private fun components(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
270 withPathInfo(http, dao)?.let { path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
271 with(http) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
272 pageTitle = "${path.projectInfo.project.name} - ${i18n("navmenu.components")}"
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
273 view = ComponentsView(
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
274 path.projectInfo,
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
275 dao.listComponentSummaries(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
276 )
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
277 feedPath = feedPath(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
278 navigationMenu = projectNavMenu(dao.listProjects(), path)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
279 styleSheets = listOf("projects")
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
280 javascript = "project-details"
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
281 render("components")
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
282 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
283 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
284 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
285
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
286 private fun componentForm(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
287 withPathInfo(http, dao)?.let { path ->
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
288 val component = if (path.componentInfo is OptionalPathInfo.Specific)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
289 path.componentInfo.elem else Component(-1, path.projectInfo.project.id)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
290
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
291 with(http) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
292 view = ComponentEditView(path.projectInfo, component, dao.listUsers())
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
293 feedPath = feedPath(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
294 navigationMenu = projectNavMenu(dao.listProjects(), path)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
295 styleSheets = listOf("projects")
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
296 render("component-form")
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
297 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
298 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
299 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
300
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
301 private fun componentCommit(http: HttpRequest, dao: DataAccessObject) {
210
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
302 val idParams = obtainIdAndProject(http, dao) ?: return
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
303 val (id, project) = idParams
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
304
210
37fbdcb422b7 minor code changes
Mike Becker <universe@uap-core.de>
parents: 207
diff changeset
305 val component = Component(id, project.id).apply {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
306 name = http.param("name") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
307 node = http.param("node") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
308 ordinal = http.param("ordinal")?.toIntOrNull() ?: 0
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
309 color = WebColor(http.param("color") ?: "#000000")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
310 description = http.param("description")
227
f0ede8046b59 #162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
311 // TODO: process error message
f0ede8046b59 #162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
312 active = http.param("active", ::boolValidator, true, mutableListOf())
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
313 lead = (http.param("lead")?.toIntOrNull() ?: -1).let {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
314 if (it < 0) null else dao.findUser(it)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
315 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
316 // intentional defaults
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
317 if (node.isBlank()) node = name
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
318 // sanitizing
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
319 node = sanitizeNode(node)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
320 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
321
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
322 if (id < 0) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
323 dao.insertComponent(component)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
324 } else {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
325 dao.updateComponent(component)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
326 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
327
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
328 http.renderCommit("projects/${project.node}/components/")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
329 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
330
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
331 private fun issue(http: HttpRequest, dao: DataAccessObject) {
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
332 val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
333 if (issue == null) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
334 http.response.sendError(404)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
335 return
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
336 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
337 renderIssueView(http, dao, issue)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
338 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
339
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
340 private fun renderIssueView(
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
341 http: HttpRequest,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
342 dao: DataAccessObject,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
343 issue: Issue,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
344 relationError: String? = null
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
345 ) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
346 withPathInfo(http, dao)?.let {path ->
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
347 val comments = dao.listComments(issue)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
348
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
349 with(http) {
304
12f696cc7905 issue viewer's page title now starts with the ID - fixes #396
Mike Becker <universe@uap-core.de>
parents: 292
diff changeset
350 pageTitle = "#${issue.id} ${issue.subject} (${path.projectInfo.project.name})"
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
351 view = IssueDetailView(
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
352 path,
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
353 issue,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
354 comments,
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
355 path.projectInfo.project,
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
356 dao.listIssues(path.projectInfo.project, true),
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
357 dao.listIssueRelations(issue),
284
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
358 relationError,
671c1c8fbf1c add full support for commit references - fixes #276
Mike Becker <universe@uap-core.de>
parents: 271
diff changeset
359 dao.listCommitRefs(issue)
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
360 )
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
361 feedPath = feedPath(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
362 navigationMenu = projectNavMenu(dao.listProjects(), path)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
363 styleSheets = listOf("projects")
207
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
364 javascript = "issue-editor"
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
365 render("issue-view")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
366 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
367 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
368 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
369
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
370 private fun issueForm(http: HttpRequest, dao: DataAccessObject) {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
371 withPathInfo(http, dao)?.let { path ->
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
372 val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) ?: Issue(
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
373 -1,
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
374 path.projectInfo.project,
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
375 )
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
376
215
028792eda9b7 #156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
377 // for new issues set some defaults
028792eda9b7 #156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
378 if (issue.id < 0) {
028792eda9b7 #156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
379 // pre-select component, if available in the path info
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
380 if (path.componentInfo is OptionalPathInfo.Specific) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
381 issue.component = path.componentInfo.elem
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
382 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
383
215
028792eda9b7 #156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
384 // pre-select version, if available in the path info
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
385 if (path.versionInfo is OptionalPathInfo.Specific) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
386 if (path.versionInfo.elem.status.isReleased) {
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
387 issue.affected = path.versionInfo.elem
215
028792eda9b7 #156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
388 } else {
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
389 issue.resolved = path.versionInfo.elem
215
028792eda9b7 #156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents: 214
diff changeset
390 }
191
193ee4828767 fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents: 186
diff changeset
391 }
193ee4828767 fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents: 186
diff changeset
392 }
193ee4828767 fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents: 186
diff changeset
393
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
394 with(http) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
395 view = IssueEditView(
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
396 issue,
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
397 path.projectInfo.versions,
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
398 path.projectInfo.components,
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
399 dao.listUsers(),
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
400 path.projectInfo.project,
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
401 path
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
402 )
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
403 feedPath = feedPath(path.projectInfo.project)
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
404 navigationMenu = projectNavMenu(dao.listProjects(), path)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
405 styleSheets = listOf("projects")
207
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
406 javascript = "issue-editor"
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
407 render("issue-form")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
408 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
409 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
410 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
411
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
412 private fun issueComment(http: HttpRequest, dao: DataAccessObject) {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
413 withPathInfo(http, dao)?.run {
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
414 val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
415 if (issue == null) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
416 http.response.sendError(404)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
417 return
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
418 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
419
207
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
420 val commentId = http.param("commentid")?.toIntOrNull() ?: -1
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
421 if (commentId > 0) {
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
422 val comment = dao.findComment(commentId)
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
423 if (comment == null) {
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
424 http.response.sendError(404)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
425 return
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
426 }
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
427 val originalAuthor = comment.author?.username
207
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
428 if (originalAuthor != null && originalAuthor == http.remoteUser) {
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
429 val newComment = http.param("comment")
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
430 if (!newComment.isNullOrBlank()) {
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
431 comment.comment = newComment
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
432 dao.updateComment(comment)
242
b7f3e972b13c #109 add comment history
Mike Becker <universe@uap-core.de>
parents: 232
diff changeset
433 dao.insertHistoryEvent(issue, comment)
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
434 } else {
247
e71ae69c68c0 remove log4j entirely
Mike Becker <universe@uap-core.de>
parents: 242
diff changeset
435 logger.debug("Not updating comment ${comment.id} because nothing changed.")
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
436 }
207
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
437 } else {
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
438 http.response.sendError(403)
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
439 return
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
440 }
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
441 } else {
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
442 val comment = IssueComment(-1, issue.id).apply {
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
443 author = http.remoteUser?.let { dao.findUserByName(it) }
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
444 comment = http.param("comment") ?: ""
479dd7993ef9 #22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents: 205
diff changeset
445 }
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
446 val newId = dao.insertComment(comment)
242
b7f3e972b13c #109 add comment history
Mike Becker <universe@uap-core.de>
parents: 232
diff changeset
447 dao.insertHistoryEvent(issue, comment, newId)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
448 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
449
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
450 http.renderCommit("${issuesHref}${issue.id}")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
451 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
452 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
453
193
1e4044d29b1c fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents: 191
diff changeset
454 private fun issueCommit(http: HttpRequest, dao: DataAccessObject) {
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
455 withPathInfo(http, dao)?.run {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
456 val issue = Issue(
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
457 http.param("id")?.toIntOrNull() ?: -1,
292
703591e739f4 add possibility to show issues w/o version or component - fixes #335
Mike Becker <universe@uap-core.de>
parents: 284
diff changeset
458 projectInfo.project
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
459 ).apply {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
460 component = dao.findComponent(http.param("component")?.toIntOrNull() ?: -1)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
461 category = IssueCategory.valueOf(http.param("category") ?: "")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
462 status = IssueStatus.valueOf(http.param("status") ?: "")
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
463 subject = http.param("subject") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
464 description = http.param("description") ?: ""
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
465 assignee = http.param("assignee")?.toIntOrNull()?.let {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
466 when (it) {
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
467 -1 -> null
306
1ab9f65e683e add fallback to project lead during automatic assignment - fixes #400
Mike Becker <universe@uap-core.de>
parents: 305
diff changeset
468 -2 -> (component?.lead ?: projectInfo.project.owner)
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
469 else -> dao.findUser(it)
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
470 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
471 }
225
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
472 // TODO: process error messages
87328572e36f #159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents: 215
diff changeset
473 eta = http.param("eta", ::dateOptValidator, null, mutableListOf())
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
474
231
dcb1d5a7ea3a #163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents: 227
diff changeset
475 affected = http.param("affected")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) }
dcb1d5a7ea3a #163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents: 227
diff changeset
476 resolved = http.param("resolved")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
477 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
478
186
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
479 val openId = if (issue.id < 0) {
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
480 val id = dao.insertIssue(issue)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
481 dao.insertHistoryEvent(issue, id)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
482 id
186
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
483 } else {
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
484 val reference = dao.findIssue(issue.id)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
485 if (reference == null) {
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
486 http.response.sendError(404)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
487 return
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
488 }
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
489
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
490 if (issue.hasChanged(reference)) {
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
491 dao.updateIssue(issue)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
492 dao.insertHistoryEvent(issue)
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
493 } else {
247
e71ae69c68c0 remove log4j entirely
Mike Becker <universe@uap-core.de>
parents: 242
diff changeset
494 logger.debug("Not updating issue ${issue.id} because nothing changed.")
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
495 }
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
496
214
69647ddb57f2 #153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents: 210
diff changeset
497 val newComment = http.param("comment")
69647ddb57f2 #153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents: 210
diff changeset
498 if (!newComment.isNullOrBlank()) {
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
499 val comment = IssueComment(-1, issue.id).apply {
214
69647ddb57f2 #153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents: 210
diff changeset
500 author = http.remoteUser?.let { dao.findUserByName(it) }
69647ddb57f2 #153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents: 210
diff changeset
501 comment = newComment
232
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
502 }
296e12ff8d1c #109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
503 val commentid = dao.insertComment(comment)
242
b7f3e972b13c #109 add comment history
Mike Becker <universe@uap-core.de>
parents: 232
diff changeset
504 dao.insertHistoryEvent(issue, comment, commentid)
214
69647ddb57f2 #153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents: 210
diff changeset
505 }
186
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
506 issue.id
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
507 }
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
508
05eec764facd fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
509 if (http.param("more") != null) {
185
5ec9fcfbdf9c re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents: 184
diff changeset
510 http.renderCommit("${issuesHref}-/create")
305
26e7f895f0f8 add new save button to issue editor - fixes #398
Mike Becker <universe@uap-core.de>
parents: 304
diff changeset
511 } else if (http.param("save") != null) {
26e7f895f0f8 add new save button to issue editor - fixes #398
Mike Becker <universe@uap-core.de>
parents: 304
diff changeset
512 http.renderCommit("${issuesHref}${openId}")
185
5ec9fcfbdf9c re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents: 184
diff changeset
513 } else {
305
26e7f895f0f8 add new save button to issue editor - fixes #398
Mike Becker <universe@uap-core.de>
parents: 304
diff changeset
514 http.renderCommit(issuesHref)
185
5ec9fcfbdf9c re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents: 184
diff changeset
515 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
516 }
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
517 }
263
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
518
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
519 private fun issueRelation(http: HttpRequest, dao: DataAccessObject) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
520 withPathInfo(http, dao)?.run {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
521 val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
522 if (issue == null) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
523 http.response.sendError(404)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
524 return
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
525 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
526
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
527 // determine the relation type
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
528 val type: Pair<RelationType, Boolean>? = http.param("type")?.let {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
529 try {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
530 if (it.startsWith("!")) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
531 Pair(RelationType.valueOf(it.substring(1)), true)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
532 } else {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
533 Pair(RelationType.valueOf(it), false)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
534 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
535 } catch (_: IllegalArgumentException) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
536 null
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
537 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
538 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
539
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
540 // if the relation type was invalid, send HTTP 500
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
541 if (type == null) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
542 http.response.sendError(500)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
543 return
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
544 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
545
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
546 // determine the target issue
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
547 val targetIssue: Issue? = http.param("issue")?.let {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
548 if (it.startsWith("#") && it.length > 1) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
549 it.substring(1).split(" ", limit = 2)[0].toIntOrNull()
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
550 ?.let(dao::findIssue)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
551 ?.takeIf { target -> target.project.id == issue.project.id }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
552 } else {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
553 null
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
554 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
555 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
556
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
557 // check if the target issue is valid
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
558 if (targetIssue == null) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
559 renderIssueView(http, dao, issue, "issue.relations.target.invalid")
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
560 return
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
561 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
562
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
563 // commit the result
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
564 dao.insertIssueRelation(IssueRelation(issue, targetIssue, type.first, type.second))
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
565 http.renderCommit("${issuesHref}${issue.id}")
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
566 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
567 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
568
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
569 private fun issueRemoveRelation(http: HttpRequest, dao: DataAccessObject) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
570 withPathInfo(http, dao)?.run {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
571 val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
572 if (issue == null) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
573 http.response.sendError(404)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
574 return
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
575 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
576
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
577 // determine relation
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
578 val type = http.param("type")?.let {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
579 try {RelationType.valueOf(it)}
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
580 catch (_:IllegalArgumentException) {null}
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
581 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
582 if (type == null) {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
583 http.response.sendError(500)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
584 return
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
585 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
586 val rel = http.param("to")?.toIntOrNull()?.let(dao::findIssue)?.let {
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
587 IssueRelation(
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
588 issue,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
589 it,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
590 type,
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
591 http.param("reverse")?.toBoolean() ?: false
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
592 )
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
593 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
594
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
595 // execute removal, if there is something to remove
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
596 rel?.run(dao::deleteIssueRelation)
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
597
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
598 // always pretend that the operation was successful - if there was nothing to remove, it's okay
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
599 http.renderCommit("${issuesHref}${issue.id}")
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
600 }
aa22103809cd #29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents: 254
diff changeset
601 }
184
e8eecee6aadf completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
diff changeset
602 }

mercurial