Sun, 08 Jan 2023 17:07:26 +0100
#15 add issue filters
184 | 1 | /* |
2 | * Copyright 2021 Mike Becker. All rights reserved. | |
3 | * | |
4 | * Redistribution and use in source and binary forms, with or without | |
5 | * modification, are permitted provided that the following conditions are met: | |
6 | * | |
7 | * 1. Redistributions of source code must retain the above copyright | |
8 | * notice, this list of conditions and the following disclaimer. | |
9 | * | |
10 | * 2. Redistributions in binary form must reproduce the above copyright | |
11 | * notice, this list of conditions and the following disclaimer in the | |
12 | * documentation and/or other materials provided with the distribution. | |
13 | * | |
14 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
15 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
16 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |
17 | * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | |
18 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
19 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | |
20 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | |
21 | * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
22 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
23 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
24 | */ | |
25 | ||
26 | package de.uapcore.lightpit.servlet | |
27 | ||
247 | 28 | import de.uapcore.lightpit.AbstractServlet |
29 | import de.uapcore.lightpit.HttpRequest | |
30 | import de.uapcore.lightpit.boolValidator | |
184 | 31 | import de.uapcore.lightpit.dao.DataAccessObject |
247 | 32 | import de.uapcore.lightpit.dateOptValidator |
184 | 33 | import de.uapcore.lightpit.entities.* |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
34 | import de.uapcore.lightpit.types.* |
184 | 35 | 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
|
36 | import jakarta.servlet.annotation.WebServlet |
184 | 37 | import java.sql.Date |
38 | ||
39 | @WebServlet(urlPatterns = ["/projects/*"]) | |
40 | class ProjectServlet : AbstractServlet() { | |
41 | ||
42 | init { | |
43 | get("/", this::projects) | |
44 | get("/%project", this::project) | |
45 | get("/%project/issues/%version/%component/", this::project) | |
46 | get("/%project/edit", this::projectForm) | |
47 | get("/-/create", this::projectForm) | |
48 | post("/-/commit", this::projectCommit) | |
49 | ||
50 | get("/%project/versions/", this::versions) | |
51 | get("/%project/versions/%version/edit", this::versionForm) | |
52 | get("/%project/versions/-/create", this::versionForm) | |
53 | post("/%project/versions/-/commit", this::versionCommit) | |
54 | ||
55 | get("/%project/components/", this::components) | |
56 | get("/%project/components/%component/edit", this::componentForm) | |
57 | get("/%project/components/-/create", this::componentForm) | |
58 | post("/%project/components/-/commit", this::componentCommit) | |
59 | ||
60 | get("/%project/issues/%version/%component/%issue", this::issue) | |
61 | 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
|
62 | 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
|
63 | 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
|
64 | get("/%project/issues/%version/%component/%issue/removeRelation", this::issueRemoveRelation) |
184 | 65 | 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
|
66 | post("/%project/issues/%version/%component/-/commit", this::issueCommit) |
184 | 67 | } |
68 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
69 | private fun projects(http: HttpRequest, dao: DataAccessObject) { |
184 | 70 | val projects = dao.listProjects() |
71 | val projectInfos = projects.map { | |
72 | ProjectInfo( | |
73 | project = it, | |
74 | versions = dao.listVersions(it), | |
75 | components = emptyList(), // not required in this view | |
76 | issueSummary = dao.collectIssueSummary(it) | |
77 | ) | |
78 | } | |
79 | ||
80 | with(http) { | |
81 | view = ProjectsView(projectInfos) | |
82 | navigationMenu = projectNavMenu(projects) | |
83 | styleSheets = listOf("projects") | |
84 | render("projects") | |
85 | } | |
86 | } | |
87 | ||
88 | private fun activeProjectNavMenu( | |
89 | projects: List<Project>, | |
90 | projectInfo: ProjectInfo, | |
91 | selectedVersion: Version? = null, | |
92 | selectedComponent: Component? = null | |
93 | ) = | |
94 | projectNavMenu( | |
95 | projects, | |
96 | projectInfo.versions, | |
97 | projectInfo.components, | |
98 | projectInfo.project, | |
99 | selectedVersion, | |
100 | selectedComponent | |
101 | ) | |
102 | ||
210 | 103 | private sealed interface LookupResult<T> |
104 | private class NotFound<T> : LookupResult<T> | |
105 | private data class Found<T>(val elem: T?) : LookupResult<T> | |
184 | 106 | |
107 | private fun <T : HasNode> HttpRequest.lookupPathParam(paramName: String, list: List<T>): LookupResult<T> { | |
108 | val node = pathParams[paramName] | |
109 | return if (node == null || node == "-") { | |
210 | 110 | Found(null) |
184 | 111 | } else { |
112 | val result = list.find { it.node == node } | |
113 | if (result == null) { | |
210 | 114 | NotFound() |
184 | 115 | } else { |
210 | 116 | Found(result) |
184 | 117 | } |
118 | } | |
119 | } | |
120 | ||
121 | private fun obtainProjectInfo(http: HttpRequest, dao: DataAccessObject): ProjectInfo? { | |
122 | val project = dao.findProjectByNode(http.pathParams["project"] ?: "") ?: return null | |
123 | ||
124 | val versions: List<Version> = dao.listVersions(project) | |
125 | val components: List<Component> = dao.listComponents(project) | |
126 | ||
127 | return ProjectInfo( | |
128 | project, | |
129 | versions, | |
130 | components, | |
131 | dao.collectIssueSummary(project) | |
132 | ) | |
133 | } | |
134 | ||
135 | private fun sanitizeNode(name: String): String { | |
136 | val san = name.replace(Regex("[/\\\\]"), "-") | |
137 | return if (san.startsWith(".")) { | |
138 | "v$san" | |
139 | } else { | |
140 | san | |
141 | } | |
142 | } | |
143 | ||
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
144 | 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
|
145 | |
210 | 146 | private data class PathInfos( |
184 | 147 | val projectInfo: ProjectInfo, |
148 | val version: Version?, | |
149 | val component: Component? | |
150 | ) { | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
151 | val project = projectInfo.project |
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
152 | val issuesHref by lazyOf("projects/${project.node}/issues/${version?.node ?: "-"}/${component?.node ?: "-"}/") |
184 | 153 | } |
154 | ||
155 | private fun withPathInfo(http: HttpRequest, dao: DataAccessObject): PathInfos? { | |
156 | val projectInfo = obtainProjectInfo(http, dao) | |
157 | if (projectInfo == null) { | |
158 | http.response.sendError(404) | |
159 | return null | |
160 | } | |
161 | ||
162 | val version = when (val result = http.lookupPathParam("version", projectInfo.versions)) { | |
210 | 163 | is NotFound -> { |
184 | 164 | http.response.sendError(404) |
165 | return null | |
166 | } | |
210 | 167 | is Found -> { |
184 | 168 | result.elem |
169 | } | |
170 | } | |
171 | val component = when (val result = http.lookupPathParam("component", projectInfo.components)) { | |
210 | 172 | is NotFound -> { |
184 | 173 | http.response.sendError(404) |
174 | return null | |
175 | } | |
210 | 176 | is Found -> { |
184 | 177 | result.elem |
178 | } | |
179 | } | |
180 | ||
181 | return PathInfos(projectInfo, version, component) | |
182 | } | |
183 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
184 | private fun project(http: HttpRequest, dao: DataAccessObject) { |
184 | 185 | withPathInfo(http, dao)?.run { |
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
186 | |
268 | 187 | val filter = IssueFilter(http) |
188 | ||
189 | val needRelationsMap = filter.onlyBlocker | |
190 | ||
191 | val relationsMap = if (needRelationsMap) dao.getIssueRelationMap(project, filter.includeDone) else emptyMap() | |
192 | ||
193 | val issues = dao.listIssues(project, filter.includeDone, version, component) | |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
194 | .sortedWith( |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
195 | IssueSorter( |
267
d8ec2d8ffa82
fix default sort criteria
Mike Becker <universe@uap-core.de>
parents:
266
diff
changeset
|
196 | IssueSorter.Criteria(IssueSorter.Field.DONE), |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
197 | IssueSorter.Criteria(IssueSorter.Field.ETA), |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
198 | IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
199 | ) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
200 | ) |
268 | 201 | .filter { |
202 | (!filter.onlyMine || (it.assignee?.username ?: "") == (http.remoteUser ?: "<Anonymous>")) && | |
203 | (!filter.onlyBlocker || (relationsMap[it.id]?.any { (_,type) -> type.blocking }?:false)) && | |
204 | (filter.status.isEmpty() || filter.status.contains(it.status)) && | |
205 | (filter.category.isEmpty() || filter.category.contains(it.category)) | |
206 | } | |
184 | 207 | |
208 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
209 | pageTitle = project.name |
268 | 210 | view = ProjectDetails(projectInfo, issues, filter, version, component) |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
211 | feedPath = feedPath(project) |
184 | 212 | navigationMenu = activeProjectNavMenu( |
213 | dao.listProjects(), | |
214 | projectInfo, | |
215 | version, | |
216 | component | |
217 | ) | |
218 | styleSheets = listOf("projects") | |
266
65c72e65ff67
simplify project-details view
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
219 | javascript = "project-details" |
184 | 220 | render("project-details") |
221 | } | |
222 | } | |
223 | } | |
224 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
225 | private fun projectForm(http: HttpRequest, dao: DataAccessObject) { |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
226 | if (!http.pathParams.containsKey("project")) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
227 | http.view = ProjectEditView(Project(-1), dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
228 | http.navigationMenu = projectNavMenu(dao.listProjects()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
229 | } else { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
230 | val projectInfo = obtainProjectInfo(http, dao) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
231 | if (projectInfo == null) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
232 | http.response.sendError(404) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
233 | return |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
234 | } |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
235 | http.view = ProjectEditView(projectInfo.project, dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
236 | http.navigationMenu = activeProjectNavMenu( |
184 | 237 | dao.listProjects(), |
238 | projectInfo | |
239 | ) | |
240 | } | |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
241 | http.styleSheets = listOf("projects") |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
242 | http.render("project-form") |
184 | 243 | } |
244 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
245 | private fun projectCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 246 | val project = Project(http.param("id")?.toIntOrNull() ?: -1).apply { |
247 | name = http.param("name") ?: "" | |
248 | node = http.param("node") ?: "" | |
249 | description = http.param("description") ?: "" | |
250 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
251 | repoUrl = http.param("repoUrl") ?: "" | |
252 | owner = (http.param("owner")?.toIntOrNull() ?: -1).let { | |
253 | if (it < 0) null else dao.findUser(it) | |
254 | } | |
255 | // intentional defaults | |
256 | if (node.isBlank()) node = name | |
257 | // sanitizing | |
258 | node = sanitizeNode(node) | |
259 | } | |
260 | ||
261 | if (project.id < 0) { | |
262 | dao.insertProject(project) | |
263 | } else { | |
264 | dao.updateProject(project) | |
265 | } | |
266 | ||
267 | http.renderCommit("projects/${project.node}") | |
268 | } | |
269 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
270 | private fun versions(http: HttpRequest, dao: DataAccessObject) { |
184 | 271 | val projectInfo = obtainProjectInfo(http, dao) |
272 | if (projectInfo == null) { | |
273 | http.response.sendError(404) | |
274 | return | |
275 | } | |
276 | ||
277 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
278 | pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.versions")}" |
184 | 279 | view = VersionsView( |
280 | projectInfo, | |
281 | dao.listVersionSummaries(projectInfo.project) | |
282 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
283 | feedPath = feedPath(projectInfo.project) |
184 | 284 | navigationMenu = activeProjectNavMenu( |
285 | dao.listProjects(), | |
286 | projectInfo | |
287 | ) | |
288 | styleSheets = listOf("projects") | |
266
65c72e65ff67
simplify project-details view
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
289 | javascript = "project-details" |
184 | 290 | render("versions") |
291 | } | |
292 | } | |
293 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
294 | private fun versionForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 295 | val projectInfo = obtainProjectInfo(http, dao) |
296 | if (projectInfo == null) { | |
297 | http.response.sendError(404) | |
298 | return | |
299 | } | |
300 | ||
301 | val version: Version | |
302 | when (val result = http.lookupPathParam("version", projectInfo.versions)) { | |
210 | 303 | is NotFound -> { |
184 | 304 | http.response.sendError(404) |
305 | return | |
306 | } | |
210 | 307 | is Found -> { |
184 | 308 | version = result.elem ?: Version(-1, projectInfo.project.id) |
309 | } | |
310 | } | |
311 | ||
312 | with(http) { | |
313 | view = VersionEditView(projectInfo, version) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
314 | feedPath = feedPath(projectInfo.project) |
184 | 315 | navigationMenu = activeProjectNavMenu( |
316 | dao.listProjects(), | |
317 | projectInfo, | |
318 | selectedVersion = version | |
319 | ) | |
320 | styleSheets = listOf("projects") | |
321 | render("version-form") | |
322 | } | |
323 | } | |
324 | ||
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
325 | private fun obtainIdAndProject(http: HttpRequest, dao: DataAccessObject): Pair<Int, Project>? { |
184 | 326 | val id = http.param("id")?.toIntOrNull() |
327 | val projectid = http.param("projectid")?.toIntOrNull() ?: -1 | |
328 | val project = dao.findProject(projectid) | |
210 | 329 | return if (id == null || project == null) { |
184 | 330 | http.response.sendError(400) |
210 | 331 | null |
332 | } else { | |
333 | Pair(id, project) | |
184 | 334 | } |
210 | 335 | } |
184 | 336 | |
210 | 337 | private fun versionCommit(http: HttpRequest, dao: DataAccessObject) { |
338 | val idParams = obtainIdAndProject(http, dao) ?: return | |
339 | val (id, project) = idParams | |
340 | ||
341 | val version = Version(id, project.id).apply { | |
184 | 342 | name = http.param("name") ?: "" |
343 | node = http.param("node") ?: "" | |
344 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
345 | 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
|
346 | // TODO: process error messages |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
347 | eol = http.param("eol", ::dateOptValidator, null, mutableListOf()) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
348 | release = http.param("release", ::dateOptValidator, null, mutableListOf()) |
184 | 349 | // intentional defaults |
350 | if (node.isBlank()) node = name | |
351 | // sanitizing | |
352 | node = sanitizeNode(node) | |
353 | } | |
354 | ||
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
355 | // sanitize eol and release date |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
356 | if (version.status.isEndOfLife) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
357 | 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
|
358 | } else if (version.status.isReleased) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
359 | 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
|
360 | } |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
361 | |
184 | 362 | if (id < 0) { |
363 | dao.insertVersion(version) | |
364 | } else { | |
365 | dao.updateVersion(version) | |
366 | } | |
367 | ||
368 | http.renderCommit("projects/${project.node}/versions/") | |
369 | } | |
370 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
371 | private fun components(http: HttpRequest, dao: DataAccessObject) { |
184 | 372 | val projectInfo = obtainProjectInfo(http, dao) |
373 | if (projectInfo == null) { | |
374 | http.response.sendError(404) | |
375 | return | |
376 | } | |
377 | ||
378 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
379 | pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.components")}" |
184 | 380 | view = ComponentsView( |
381 | projectInfo, | |
382 | dao.listComponentSummaries(projectInfo.project) | |
383 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
384 | feedPath = feedPath(projectInfo.project) |
184 | 385 | navigationMenu = activeProjectNavMenu( |
386 | dao.listProjects(), | |
387 | projectInfo | |
388 | ) | |
389 | styleSheets = listOf("projects") | |
266
65c72e65ff67
simplify project-details view
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
390 | javascript = "project-details" |
184 | 391 | render("components") |
392 | } | |
393 | } | |
394 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
395 | private fun componentForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 396 | val projectInfo = obtainProjectInfo(http, dao) |
397 | if (projectInfo == null) { | |
398 | http.response.sendError(404) | |
399 | return | |
400 | } | |
401 | ||
402 | val component: Component | |
403 | when (val result = http.lookupPathParam("component", projectInfo.components)) { | |
210 | 404 | is NotFound -> { |
184 | 405 | http.response.sendError(404) |
406 | return | |
407 | } | |
210 | 408 | is Found -> { |
184 | 409 | component = result.elem ?: Component(-1, projectInfo.project.id) |
410 | } | |
411 | } | |
412 | ||
413 | with(http) { | |
414 | view = ComponentEditView(projectInfo, component, dao.listUsers()) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
415 | feedPath = feedPath(projectInfo.project) |
184 | 416 | navigationMenu = activeProjectNavMenu( |
417 | dao.listProjects(), | |
418 | projectInfo, | |
419 | selectedComponent = component | |
420 | ) | |
421 | styleSheets = listOf("projects") | |
422 | render("component-form") | |
423 | } | |
424 | } | |
425 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
426 | private fun componentCommit(http: HttpRequest, dao: DataAccessObject) { |
210 | 427 | val idParams = obtainIdAndProject(http, dao) ?: return |
428 | val (id, project) = idParams | |
184 | 429 | |
210 | 430 | val component = Component(id, project.id).apply { |
184 | 431 | name = http.param("name") ?: "" |
432 | node = http.param("node") ?: "" | |
433 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
434 | color = WebColor(http.param("color") ?: "#000000") | |
435 | description = http.param("description") | |
227
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
436 | // TODO: process error message |
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
437 | active = http.param("active", ::boolValidator, true, mutableListOf()) |
184 | 438 | lead = (http.param("lead")?.toIntOrNull() ?: -1).let { |
439 | if (it < 0) null else dao.findUser(it) | |
440 | } | |
441 | // intentional defaults | |
442 | if (node.isBlank()) node = name | |
443 | // sanitizing | |
444 | node = sanitizeNode(node) | |
445 | } | |
446 | ||
447 | if (id < 0) { | |
448 | dao.insertComponent(component) | |
449 | } else { | |
450 | dao.updateComponent(component) | |
451 | } | |
452 | ||
453 | http.renderCommit("projects/${project.node}/components/") | |
454 | } | |
455 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
456 | 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
|
457 | 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
|
458 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
459 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
460 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
461 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
462 | renderIssueView(http, dao, issue) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
463 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
464 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
465 | private fun renderIssueView( |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
466 | http: HttpRequest, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
467 | dao: DataAccessObject, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
468 | issue: Issue, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
469 | relationError: String? = null |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
470 | ) { |
184 | 471 | withPathInfo(http, dao)?.run { |
472 | val comments = dao.listComments(issue) | |
473 | ||
474 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
475 | pageTitle = "${projectInfo.project.name}: #${issue.id} ${issue.subject}" |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
476 | view = IssueDetailView( |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
477 | issue, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
478 | comments, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
479 | project, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
480 | version, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
481 | component, |
268 | 482 | dao.listIssues(project, true), |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
483 | dao.listIssueRelations(issue), |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
484 | relationError |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
485 | ) |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
486 | feedPath = feedPath(projectInfo.project) |
184 | 487 | navigationMenu = activeProjectNavMenu( |
488 | dao.listProjects(), | |
489 | projectInfo, | |
490 | version, | |
491 | component | |
492 | ) | |
493 | styleSheets = listOf("projects") | |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
494 | javascript = "issue-editor" |
184 | 495 | render("issue-view") |
496 | } | |
497 | } | |
498 | } | |
499 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
500 | private fun issueForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 501 | withPathInfo(http, dao)?.run { |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
502 | val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) ?: Issue( |
184 | 503 | -1, |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
504 | project, |
184 | 505 | ) |
506 | ||
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
507 | // for new issues set some defaults |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
508 | if (issue.id < 0) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
509 | // pre-select component, if available in the path info |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
510 | issue.component = component |
184 | 511 | |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
512 | // pre-select version, if available in the path info |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
513 | if (version != null) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
514 | if (version.status.isReleased) { |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
515 | issue.affected = version |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
516 | } else { |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
517 | issue.resolved = version |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
518 | } |
191
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
519 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
520 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
521 | |
184 | 522 | with(http) { |
523 | view = IssueEditView( | |
524 | issue, | |
525 | projectInfo.versions, | |
526 | projectInfo.components, | |
527 | dao.listUsers(), | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
528 | project, |
184 | 529 | version, |
530 | component | |
531 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
532 | feedPath = feedPath(projectInfo.project) |
184 | 533 | navigationMenu = activeProjectNavMenu( |
534 | dao.listProjects(), | |
535 | projectInfo, | |
536 | version, | |
537 | component | |
538 | ) | |
539 | styleSheets = listOf("projects") | |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
540 | javascript = "issue-editor" |
184 | 541 | render("issue-form") |
542 | } | |
543 | } | |
544 | } | |
545 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
546 | private fun issueComment(http: HttpRequest, dao: DataAccessObject) { |
184 | 547 | withPathInfo(http, dao)?.run { |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
548 | val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) |
184 | 549 | if (issue == null) { |
550 | http.response.sendError(404) | |
551 | return | |
552 | } | |
553 | ||
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
554 | 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
|
555 | if (commentId > 0) { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
556 | 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
|
557 | if (comment == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
558 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
559 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
560 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
561 | val originalAuthor = comment.author?.username |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
562 | 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
|
563 | 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
|
564 | if (!newComment.isNullOrBlank()) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
565 | comment.comment = newComment |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
566 | dao.updateComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
567 | 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
|
568 | } else { |
247 | 569 | 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
|
570 | } |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
571 | } else { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
572 | http.response.sendError(403) |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
573 | return |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
574 | } |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
575 | } else { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
576 | 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
|
577 | 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
|
578 | comment = http.param("comment") ?: "" |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
579 | } |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
580 | val newId = dao.insertComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
581 | dao.insertHistoryEvent(issue, comment, newId) |
184 | 582 | } |
583 | ||
584 | http.renderCommit("${issuesHref}${issue.id}") | |
585 | } | |
586 | } | |
587 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
588 | private fun issueCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 589 | withPathInfo(http, dao)?.run { |
590 | val issue = Issue( | |
591 | http.param("id")?.toIntOrNull() ?: -1, | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
592 | project |
184 | 593 | ).apply { |
594 | component = dao.findComponent(http.param("component")?.toIntOrNull() ?: -1) | |
595 | category = IssueCategory.valueOf(http.param("category") ?: "") | |
596 | status = IssueStatus.valueOf(http.param("status") ?: "") | |
597 | subject = http.param("subject") ?: "" | |
598 | description = http.param("description") ?: "" | |
599 | assignee = http.param("assignee")?.toIntOrNull()?.let { | |
600 | when (it) { | |
601 | -1 -> null | |
602 | -2 -> component?.lead | |
603 | else -> dao.findUser(it) | |
604 | } | |
605 | } | |
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
606 | // TODO: process error messages |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
607 | eta = http.param("eta", ::dateOptValidator, null, mutableListOf()) |
184 | 608 | |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
609 | 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
|
610 | resolved = http.param("resolved")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) } |
184 | 611 | } |
612 | ||
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
613 | 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
|
614 | 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
|
615 | dao.insertHistoryEvent(issue, id) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
616 | id |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
617 | } else { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
618 | 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
|
619 | if (reference == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
620 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
621 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
622 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
623 | |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
624 | if (issue.hasChanged(reference)) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
625 | dao.updateIssue(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
626 | dao.insertHistoryEvent(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
627 | } else { |
247 | 628 | 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
|
629 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
630 | |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
631 | val newComment = http.param("comment") |
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
632 | if (!newComment.isNullOrBlank()) { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
633 | 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
|
634 | 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
|
635 | comment = newComment |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
636 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
637 | val commentid = dao.insertComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
638 | dao.insertHistoryEvent(issue, comment, commentid) |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
639 | } |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
640 | issue.id |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
641 | } |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
642 | |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
643 | if (http.param("more") != null) { |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
644 | http.renderCommit("${issuesHref}-/create") |
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
645 | } else { |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
646 | http.renderCommit("${issuesHref}${openId}") |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
647 | } |
184 | 648 | } |
649 | } | |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
650 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
651 | private fun issueRelation(http: HttpRequest, dao: DataAccessObject) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
652 | withPathInfo(http, dao)?.run { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
653 | 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
|
654 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
655 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
656 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
657 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
658 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
659 | // determine the relation type |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
660 | 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
|
661 | try { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
662 | if (it.startsWith("!")) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
663 | Pair(RelationType.valueOf(it.substring(1)), true) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
664 | } else { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
665 | Pair(RelationType.valueOf(it), false) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
666 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
667 | } catch (_: IllegalArgumentException) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
668 | null |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
669 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
670 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
671 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
672 | // 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
|
673 | if (type == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
674 | http.response.sendError(500) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
675 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
676 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
677 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
678 | // determine the target issue |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
679 | val targetIssue: Issue? = http.param("issue")?.let { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
680 | if (it.startsWith("#") && it.length > 1) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
681 | 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
|
682 | ?.let(dao::findIssue) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
683 | ?.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
|
684 | } else { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
685 | null |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
686 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
687 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
688 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
689 | // check if the target issue is valid |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
690 | if (targetIssue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
691 | 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
|
692 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
693 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
694 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
695 | // commit the result |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
696 | 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
|
697 | http.renderCommit("${issuesHref}${issue.id}") |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
698 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
699 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
700 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
701 | private fun issueRemoveRelation(http: HttpRequest, dao: DataAccessObject) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
702 | withPathInfo(http, dao)?.run { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
703 | 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
|
704 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
705 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
706 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
707 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
708 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
709 | // determine relation |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
710 | val type = http.param("type")?.let { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
711 | try {RelationType.valueOf(it)} |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
712 | catch (_:IllegalArgumentException) {null} |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
713 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
714 | if (type == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
715 | http.response.sendError(500) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
716 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
717 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
718 | 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
|
719 | IssueRelation( |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
720 | issue, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
721 | it, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
722 | type, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
723 | http.param("reverse")?.toBoolean() ?: false |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
724 | ) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
725 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
726 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
727 | // 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
|
728 | rel?.run(dao::deleteIssueRelation) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
729 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
730 | // 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
|
731 | http.renderCommit("${issuesHref}${issue.id}") |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
732 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
733 | } |
184 | 734 | } |