Tue, 03 Jan 2023 18:25:51 +0100
fix default sort criteria
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 | |
248
90dc13c78b5d
simplify listIssues() interface
Mike Becker <universe@uap-core.de>
parents:
247
diff
changeset
|
187 | val issues = dao.listIssues(project, version, component) |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
188 | .sortedWith( |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
189 | IssueSorter( |
267
d8ec2d8ffa82
fix default sort criteria
Mike Becker <universe@uap-core.de>
parents:
266
diff
changeset
|
190 | IssueSorter.Criteria(IssueSorter.Field.DONE), |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
191 | IssueSorter.Criteria(IssueSorter.Field.ETA), |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
192 | IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
193 | ) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
194 | ) |
184 | 195 | |
196 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
197 | pageTitle = project.name |
184 | 198 | view = ProjectDetails(projectInfo, issues, 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
|
199 | feedPath = feedPath(project) |
184 | 200 | navigationMenu = activeProjectNavMenu( |
201 | dao.listProjects(), | |
202 | projectInfo, | |
203 | version, | |
204 | component | |
205 | ) | |
206 | styleSheets = listOf("projects") | |
266
65c72e65ff67
simplify project-details view
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
207 | javascript = "project-details" |
184 | 208 | render("project-details") |
209 | } | |
210 | } | |
211 | } | |
212 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
213 | private fun projectForm(http: HttpRequest, dao: DataAccessObject) { |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
214 | if (!http.pathParams.containsKey("project")) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
215 | http.view = ProjectEditView(Project(-1), dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
216 | http.navigationMenu = projectNavMenu(dao.listProjects()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
217 | } else { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
218 | val projectInfo = obtainProjectInfo(http, dao) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
219 | if (projectInfo == null) { |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
220 | http.response.sendError(404) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
221 | return |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
222 | } |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
223 | http.view = ProjectEditView(projectInfo.project, dao.listUsers()) |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
224 | http.navigationMenu = activeProjectNavMenu( |
184 | 225 | dao.listProjects(), |
226 | projectInfo | |
227 | ) | |
228 | } | |
200
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
229 | http.styleSheets = listOf("projects") |
a5ddfaf6b469
fixes project creation not working
Mike Becker <universe@uap-core.de>
parents:
198
diff
changeset
|
230 | http.render("project-form") |
184 | 231 | } |
232 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
233 | private fun projectCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 234 | val project = Project(http.param("id")?.toIntOrNull() ?: -1).apply { |
235 | name = http.param("name") ?: "" | |
236 | node = http.param("node") ?: "" | |
237 | description = http.param("description") ?: "" | |
238 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
239 | repoUrl = http.param("repoUrl") ?: "" | |
240 | owner = (http.param("owner")?.toIntOrNull() ?: -1).let { | |
241 | if (it < 0) null else dao.findUser(it) | |
242 | } | |
243 | // intentional defaults | |
244 | if (node.isBlank()) node = name | |
245 | // sanitizing | |
246 | node = sanitizeNode(node) | |
247 | } | |
248 | ||
249 | if (project.id < 0) { | |
250 | dao.insertProject(project) | |
251 | } else { | |
252 | dao.updateProject(project) | |
253 | } | |
254 | ||
255 | http.renderCommit("projects/${project.node}") | |
256 | } | |
257 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
258 | private fun versions(http: HttpRequest, dao: DataAccessObject) { |
184 | 259 | val projectInfo = obtainProjectInfo(http, dao) |
260 | if (projectInfo == null) { | |
261 | http.response.sendError(404) | |
262 | return | |
263 | } | |
264 | ||
265 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
266 | pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.versions")}" |
184 | 267 | view = VersionsView( |
268 | projectInfo, | |
269 | dao.listVersionSummaries(projectInfo.project) | |
270 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
271 | feedPath = feedPath(projectInfo.project) |
184 | 272 | navigationMenu = activeProjectNavMenu( |
273 | dao.listProjects(), | |
274 | projectInfo | |
275 | ) | |
276 | styleSheets = listOf("projects") | |
266
65c72e65ff67
simplify project-details view
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
277 | javascript = "project-details" |
184 | 278 | render("versions") |
279 | } | |
280 | } | |
281 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
282 | private fun versionForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 283 | val projectInfo = obtainProjectInfo(http, dao) |
284 | if (projectInfo == null) { | |
285 | http.response.sendError(404) | |
286 | return | |
287 | } | |
288 | ||
289 | val version: Version | |
290 | when (val result = http.lookupPathParam("version", projectInfo.versions)) { | |
210 | 291 | is NotFound -> { |
184 | 292 | http.response.sendError(404) |
293 | return | |
294 | } | |
210 | 295 | is Found -> { |
184 | 296 | version = result.elem ?: Version(-1, projectInfo.project.id) |
297 | } | |
298 | } | |
299 | ||
300 | with(http) { | |
301 | 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
|
302 | feedPath = feedPath(projectInfo.project) |
184 | 303 | navigationMenu = activeProjectNavMenu( |
304 | dao.listProjects(), | |
305 | projectInfo, | |
306 | selectedVersion = version | |
307 | ) | |
308 | styleSheets = listOf("projects") | |
309 | render("version-form") | |
310 | } | |
311 | } | |
312 | ||
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
313 | private fun obtainIdAndProject(http: HttpRequest, dao: DataAccessObject): Pair<Int, Project>? { |
184 | 314 | val id = http.param("id")?.toIntOrNull() |
315 | val projectid = http.param("projectid")?.toIntOrNull() ?: -1 | |
316 | val project = dao.findProject(projectid) | |
210 | 317 | return if (id == null || project == null) { |
184 | 318 | http.response.sendError(400) |
210 | 319 | null |
320 | } else { | |
321 | Pair(id, project) | |
184 | 322 | } |
210 | 323 | } |
184 | 324 | |
210 | 325 | private fun versionCommit(http: HttpRequest, dao: DataAccessObject) { |
326 | val idParams = obtainIdAndProject(http, dao) ?: return | |
327 | val (id, project) = idParams | |
328 | ||
329 | val version = Version(id, project.id).apply { | |
184 | 330 | name = http.param("name") ?: "" |
331 | node = http.param("node") ?: "" | |
332 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
333 | 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
|
334 | // TODO: process error messages |
249
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
335 | eol = http.param("eol", ::dateOptValidator, null, mutableListOf()) |
6bded7090719
move IssueSorter to viewmodel package
Mike Becker <universe@uap-core.de>
parents:
248
diff
changeset
|
336 | release = http.param("release", ::dateOptValidator, null, mutableListOf()) |
184 | 337 | // intentional defaults |
338 | if (node.isBlank()) node = name | |
339 | // sanitizing | |
340 | node = sanitizeNode(node) | |
341 | } | |
342 | ||
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
343 | // sanitize eol and release date |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
344 | if (version.status.isEndOfLife) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
345 | 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
|
346 | } else if (version.status.isReleased) { |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
347 | 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
|
348 | } |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
349 | |
184 | 350 | if (id < 0) { |
351 | dao.insertVersion(version) | |
352 | } else { | |
353 | dao.updateVersion(version) | |
354 | } | |
355 | ||
356 | http.renderCommit("projects/${project.node}/versions/") | |
357 | } | |
358 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
359 | private fun components(http: HttpRequest, dao: DataAccessObject) { |
184 | 360 | val projectInfo = obtainProjectInfo(http, dao) |
361 | if (projectInfo == null) { | |
362 | http.response.sendError(404) | |
363 | return | |
364 | } | |
365 | ||
366 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
367 | pageTitle = "${projectInfo.project.name} - ${i18n("navmenu.components")}" |
184 | 368 | view = ComponentsView( |
369 | projectInfo, | |
370 | dao.listComponentSummaries(projectInfo.project) | |
371 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
372 | feedPath = feedPath(projectInfo.project) |
184 | 373 | navigationMenu = activeProjectNavMenu( |
374 | dao.listProjects(), | |
375 | projectInfo | |
376 | ) | |
377 | styleSheets = listOf("projects") | |
266
65c72e65ff67
simplify project-details view
Mike Becker <universe@uap-core.de>
parents:
265
diff
changeset
|
378 | javascript = "project-details" |
184 | 379 | render("components") |
380 | } | |
381 | } | |
382 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
383 | private fun componentForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 384 | val projectInfo = obtainProjectInfo(http, dao) |
385 | if (projectInfo == null) { | |
386 | http.response.sendError(404) | |
387 | return | |
388 | } | |
389 | ||
390 | val component: Component | |
391 | when (val result = http.lookupPathParam("component", projectInfo.components)) { | |
210 | 392 | is NotFound -> { |
184 | 393 | http.response.sendError(404) |
394 | return | |
395 | } | |
210 | 396 | is Found -> { |
184 | 397 | component = result.elem ?: Component(-1, projectInfo.project.id) |
398 | } | |
399 | } | |
400 | ||
401 | with(http) { | |
402 | 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
|
403 | feedPath = feedPath(projectInfo.project) |
184 | 404 | navigationMenu = activeProjectNavMenu( |
405 | dao.listProjects(), | |
406 | projectInfo, | |
407 | selectedComponent = component | |
408 | ) | |
409 | styleSheets = listOf("projects") | |
410 | render("component-form") | |
411 | } | |
412 | } | |
413 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
414 | private fun componentCommit(http: HttpRequest, dao: DataAccessObject) { |
210 | 415 | val idParams = obtainIdAndProject(http, dao) ?: return |
416 | val (id, project) = idParams | |
184 | 417 | |
210 | 418 | val component = Component(id, project.id).apply { |
184 | 419 | name = http.param("name") ?: "" |
420 | node = http.param("node") ?: "" | |
421 | ordinal = http.param("ordinal")?.toIntOrNull() ?: 0 | |
422 | color = WebColor(http.param("color") ?: "#000000") | |
423 | description = http.param("description") | |
227
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
424 | // TODO: process error message |
f0ede8046b59
#162 adds active flag to component
Mike Becker <universe@uap-core.de>
parents:
225
diff
changeset
|
425 | active = http.param("active", ::boolValidator, true, mutableListOf()) |
184 | 426 | lead = (http.param("lead")?.toIntOrNull() ?: -1).let { |
427 | if (it < 0) null else dao.findUser(it) | |
428 | } | |
429 | // intentional defaults | |
430 | if (node.isBlank()) node = name | |
431 | // sanitizing | |
432 | node = sanitizeNode(node) | |
433 | } | |
434 | ||
435 | if (id < 0) { | |
436 | dao.insertComponent(component) | |
437 | } else { | |
438 | dao.updateComponent(component) | |
439 | } | |
440 | ||
441 | http.renderCommit("projects/${project.node}/components/") | |
442 | } | |
443 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
444 | 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
|
445 | 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
|
446 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
447 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
448 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
449 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
450 | renderIssueView(http, dao, issue) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
451 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
452 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
453 | private fun renderIssueView( |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
454 | http: HttpRequest, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
455 | dao: DataAccessObject, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
456 | issue: Issue, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
457 | relationError: String? = null |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
458 | ) { |
184 | 459 | withPathInfo(http, dao)?.run { |
460 | val comments = dao.listComments(issue) | |
461 | ||
462 | with(http) { | |
205
7725a79416f3
#115 adds custom page titles
Mike Becker <universe@uap-core.de>
parents:
200
diff
changeset
|
463 | 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
|
464 | view = IssueDetailView( |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
465 | issue, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
466 | comments, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
467 | project, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
468 | version, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
469 | component, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
470 | dao.listIssues(project), |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
471 | dao.listIssueRelations(issue), |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
472 | relationError |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
473 | ) |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
474 | feedPath = feedPath(projectInfo.project) |
184 | 475 | navigationMenu = activeProjectNavMenu( |
476 | dao.listProjects(), | |
477 | projectInfo, | |
478 | version, | |
479 | component | |
480 | ) | |
481 | styleSheets = listOf("projects") | |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
482 | javascript = "issue-editor" |
184 | 483 | render("issue-view") |
484 | } | |
485 | } | |
486 | } | |
487 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
488 | private fun issueForm(http: HttpRequest, dao: DataAccessObject) { |
184 | 489 | withPathInfo(http, dao)?.run { |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
490 | val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) ?: Issue( |
184 | 491 | -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
|
492 | project, |
184 | 493 | ) |
494 | ||
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
495 | // for new issues set some defaults |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
496 | if (issue.id < 0) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
497 | // 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
|
498 | issue.component = component |
184 | 499 | |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
500 | // 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
|
501 | if (version != null) { |
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
502 | if (version.status.isReleased) { |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
503 | issue.affected = version |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
504 | } else { |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
505 | issue.resolved = version |
215
028792eda9b7
#156 fixes auto-selection overriding issue data
Mike Becker <universe@uap-core.de>
parents:
214
diff
changeset
|
506 | } |
191
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
507 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
508 | } |
193ee4828767
fixes #134 - automatic version selection
Mike Becker <universe@uap-core.de>
parents:
186
diff
changeset
|
509 | |
184 | 510 | with(http) { |
511 | view = IssueEditView( | |
512 | issue, | |
513 | projectInfo.versions, | |
514 | projectInfo.components, | |
515 | 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
|
516 | project, |
184 | 517 | version, |
518 | component | |
519 | ) | |
198
94f174d591ab
fixes wrong handling of feeds - only one channel per feed is allowed
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
520 | feedPath = feedPath(projectInfo.project) |
184 | 521 | navigationMenu = activeProjectNavMenu( |
522 | dao.listProjects(), | |
523 | projectInfo, | |
524 | version, | |
525 | component | |
526 | ) | |
527 | styleSheets = listOf("projects") | |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
528 | javascript = "issue-editor" |
184 | 529 | render("issue-form") |
530 | } | |
531 | } | |
532 | } | |
533 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
534 | private fun issueComment(http: HttpRequest, dao: DataAccessObject) { |
184 | 535 | withPathInfo(http, dao)?.run { |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
536 | val issue = http.pathParams["issue"]?.toIntOrNull()?.let(dao::findIssue) |
184 | 537 | if (issue == null) { |
538 | http.response.sendError(404) | |
539 | return | |
540 | } | |
541 | ||
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
542 | 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
|
543 | if (commentId > 0) { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
544 | 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
|
545 | if (comment == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
546 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
547 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
548 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
549 | val originalAuthor = comment.author?.username |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
550 | 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
|
551 | 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
|
552 | if (!newComment.isNullOrBlank()) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
553 | comment.comment = newComment |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
554 | dao.updateComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
555 | 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
|
556 | } else { |
247 | 557 | 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
|
558 | } |
207
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
559 | } else { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
560 | http.response.sendError(403) |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
561 | return |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
562 | } |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
563 | } else { |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
564 | 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
|
565 | 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
|
566 | comment = http.param("comment") ?: "" |
479dd7993ef9
#22 adds possibility to edit own comments
Mike Becker <universe@uap-core.de>
parents:
205
diff
changeset
|
567 | } |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
568 | val newId = dao.insertComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
569 | dao.insertHistoryEvent(issue, comment, newId) |
184 | 570 | } |
571 | ||
572 | http.renderCommit("${issuesHref}${issue.id}") | |
573 | } | |
574 | } | |
575 | ||
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
191
diff
changeset
|
576 | private fun issueCommit(http: HttpRequest, dao: DataAccessObject) { |
184 | 577 | withPathInfo(http, dao)?.run { |
578 | val issue = Issue( | |
579 | 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
|
580 | project |
184 | 581 | ).apply { |
582 | component = dao.findComponent(http.param("component")?.toIntOrNull() ?: -1) | |
583 | category = IssueCategory.valueOf(http.param("category") ?: "") | |
584 | status = IssueStatus.valueOf(http.param("status") ?: "") | |
585 | subject = http.param("subject") ?: "" | |
586 | description = http.param("description") ?: "" | |
587 | assignee = http.param("assignee")?.toIntOrNull()?.let { | |
588 | when (it) { | |
589 | -1 -> null | |
590 | -2 -> component?.lead | |
591 | else -> dao.findUser(it) | |
592 | } | |
593 | } | |
225
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
594 | // TODO: process error messages |
87328572e36f
#159 adds release and eol dates
Mike Becker <universe@uap-core.de>
parents:
215
diff
changeset
|
595 | eta = http.param("eta", ::dateOptValidator, null, mutableListOf()) |
184 | 596 | |
231
dcb1d5a7ea3a
#163 removes multi selection for versions
Mike Becker <universe@uap-core.de>
parents:
227
diff
changeset
|
597 | 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
|
598 | resolved = http.param("resolved")?.toIntOrNull()?.takeIf { it > 0 }?.let { Version(it, project.id) } |
184 | 599 | } |
600 | ||
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
601 | 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
|
602 | 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
|
603 | dao.insertHistoryEvent(issue, id) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
604 | id |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
605 | } else { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
606 | 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
|
607 | if (reference == null) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
608 | http.response.sendError(404) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
609 | return |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
610 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
611 | |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
612 | if (issue.hasChanged(reference)) { |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
613 | dao.updateIssue(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
614 | dao.insertHistoryEvent(issue) |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
615 | } else { |
247 | 616 | 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
|
617 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
618 | |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
619 | val newComment = http.param("comment") |
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
620 | if (!newComment.isNullOrBlank()) { |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
621 | 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
|
622 | 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
|
623 | comment = newComment |
232
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
624 | } |
296e12ff8d1c
#109 adds Stasi that collects intel for the feed
Mike Becker <universe@uap-core.de>
parents:
231
diff
changeset
|
625 | val commentid = dao.insertComment(comment) |
242
b7f3e972b13c
#109 add comment history
Mike Becker <universe@uap-core.de>
parents:
232
diff
changeset
|
626 | dao.insertHistoryEvent(issue, comment, commentid) |
214
69647ddb57f2
#153 adds comment box to issues form
Mike Becker <universe@uap-core.de>
parents:
210
diff
changeset
|
627 | } |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
628 | issue.id |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
629 | } |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
630 | |
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
631 | if (http.param("more") != null) { |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
632 | http.renderCommit("${issuesHref}-/create") |
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
633 | } else { |
186
05eec764facd
fixes some minor migration regressions
Mike Becker <universe@uap-core.de>
parents:
185
diff
changeset
|
634 | http.renderCommit("${issuesHref}${openId}") |
185
5ec9fcfbdf9c
re-enables the "create another" feature
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
635 | } |
184 | 636 | } |
637 | } | |
263
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
638 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
639 | private fun issueRelation(http: HttpRequest, dao: DataAccessObject) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
640 | withPathInfo(http, dao)?.run { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
641 | 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
|
642 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
643 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
644 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
645 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
646 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
647 | // determine the relation type |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
648 | 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
|
649 | try { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
650 | if (it.startsWith("!")) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
651 | Pair(RelationType.valueOf(it.substring(1)), true) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
652 | } else { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
653 | Pair(RelationType.valueOf(it), false) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
654 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
655 | } catch (_: IllegalArgumentException) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
656 | null |
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 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
660 | // 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
|
661 | if (type == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
662 | http.response.sendError(500) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
663 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
664 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
665 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
666 | // determine the target issue |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
667 | val targetIssue: Issue? = http.param("issue")?.let { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
668 | if (it.startsWith("#") && it.length > 1) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
669 | 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
|
670 | ?.let(dao::findIssue) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
671 | ?.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
|
672 | } else { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
673 | null |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
674 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
675 | } |
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 | // check if the target issue is valid |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
678 | if (targetIssue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
679 | 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
|
680 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
681 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
682 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
683 | // commit the result |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
684 | 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
|
685 | http.renderCommit("${issuesHref}${issue.id}") |
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 | private fun issueRemoveRelation(http: HttpRequest, dao: DataAccessObject) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
690 | withPathInfo(http, dao)?.run { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
691 | 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
|
692 | if (issue == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
693 | http.response.sendError(404) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
694 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
695 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
696 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
697 | // determine relation |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
698 | val type = http.param("type")?.let { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
699 | try {RelationType.valueOf(it)} |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
700 | catch (_:IllegalArgumentException) {null} |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
701 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
702 | if (type == null) { |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
703 | http.response.sendError(500) |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
704 | return |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
705 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
706 | 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
|
707 | IssueRelation( |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
708 | issue, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
709 | it, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
710 | type, |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
711 | http.param("reverse")?.toBoolean() ?: false |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
712 | ) |
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 | |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
715 | // 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
|
716 | rel?.run(dao::deleteIssueRelation) |
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 | // 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
|
719 | http.renderCommit("${issuesHref}${issue.id}") |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
720 | } |
aa22103809cd
#29 add possibility to relate issues
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
721 | } |
184 | 722 | } |