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