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