Mon, 21 Dec 2020 18:29:34 +0100
major refactoring of DAO architecture - also fixes #114
universe@41 | 1 | /* |
universe@41 | 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
universe@41 | 3 | * |
universe@41 | 4 | * Copyright 2018 Mike Becker. All rights reserved. |
universe@41 | 5 | * |
universe@41 | 6 | * Redistribution and use in source and binary forms, with or without |
universe@41 | 7 | * modification, are permitted provided that the following conditions are met: |
universe@41 | 8 | * |
universe@41 | 9 | * 1. Redistributions of source code must retain the above copyright |
universe@41 | 10 | * notice, this list of conditions and the following disclaimer. |
universe@41 | 11 | * |
universe@41 | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
universe@41 | 13 | * notice, this list of conditions and the following disclaimer in the |
universe@41 | 14 | * documentation and/or other materials provided with the distribution. |
universe@41 | 15 | * |
universe@41 | 16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
universe@41 | 17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
universe@41 | 18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
universe@41 | 19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
universe@41 | 20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
universe@41 | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
universe@41 | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
universe@41 | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
universe@41 | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
universe@41 | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
universe@41 | 26 | * POSSIBILITY OF SUCH DAMAGE. |
universe@41 | 27 | * |
universe@41 | 28 | */ |
universe@41 | 29 | package de.uapcore.lightpit.modules; |
universe@41 | 30 | |
universe@41 | 31 | |
universe@41 | 32 | import de.uapcore.lightpit.*; |
universe@167 | 33 | import de.uapcore.lightpit.dao.DataAccessObject; |
universe@64 | 34 | import de.uapcore.lightpit.entities.*; |
universe@167 | 35 | import de.uapcore.lightpit.filter.AllFilter; |
universe@167 | 36 | import de.uapcore.lightpit.filter.IssueFilter; |
universe@167 | 37 | import de.uapcore.lightpit.filter.NoneFilter; |
universe@167 | 38 | import de.uapcore.lightpit.filter.SpecificFilter; |
universe@167 | 39 | import de.uapcore.lightpit.types.IssueCategory; |
universe@167 | 40 | import de.uapcore.lightpit.types.IssueStatus; |
universe@167 | 41 | import de.uapcore.lightpit.types.VersionStatus; |
universe@134 | 42 | import de.uapcore.lightpit.types.WebColor; |
universe@86 | 43 | import de.uapcore.lightpit.viewmodel.*; |
universe@121 | 44 | import de.uapcore.lightpit.viewmodel.util.IssueSorter; |
universe@59 | 45 | import org.slf4j.Logger; |
universe@59 | 46 | import org.slf4j.LoggerFactory; |
universe@41 | 47 | |
universe@157 | 48 | import javax.servlet.ServletException; |
universe@41 | 49 | import javax.servlet.annotation.WebServlet; |
universe@41 | 50 | import javax.servlet.http.HttpServletRequest; |
universe@59 | 51 | import javax.servlet.http.HttpServletResponse; |
universe@59 | 52 | import java.io.IOException; |
universe@75 | 53 | import java.sql.Date; |
universe@47 | 54 | import java.sql.SQLException; |
universe@86 | 55 | import java.util.NoSuchElementException; |
universe@136 | 56 | import java.util.Optional; |
universe@83 | 57 | import java.util.stream.Collectors; |
universe@83 | 58 | import java.util.stream.Stream; |
universe@41 | 59 | |
universe@41 | 60 | @WebServlet( |
universe@41 | 61 | name = "ProjectsModule", |
universe@41 | 62 | urlPatterns = "/projects/*" |
universe@41 | 63 | ) |
universe@41 | 64 | public final class ProjectsModule extends AbstractLightPITServlet { |
universe@41 | 65 | |
universe@59 | 66 | private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class); |
universe@59 | 67 | |
universe@78 | 68 | @Override |
universe@78 | 69 | protected String getResourceBundleName() { |
universe@78 | 70 | return "localization.projects"; |
universe@78 | 71 | } |
universe@71 | 72 | |
universe@158 | 73 | private static int parseIntOrZero(String str) { |
universe@158 | 74 | try { |
universe@158 | 75 | return Integer.parseInt(str); |
universe@158 | 76 | } catch (NumberFormatException ex) { |
universe@158 | 77 | return 0; |
universe@158 | 78 | } |
universe@158 | 79 | } |
universe@158 | 80 | |
universe@167 | 81 | private void populate(ProjectView viewModel, PathParameters pathParameters, DataAccessObject dao) { |
universe@167 | 82 | dao.listProjects().stream().map(ProjectInfo::new).forEach(viewModel.getProjectList()::add); |
universe@99 | 83 | |
universe@131 | 84 | if (pathParameters == null) |
universe@131 | 85 | return; |
universe@131 | 86 | |
universe@99 | 87 | // Select Project |
universe@167 | 88 | final var project = dao.findProjectByNode(pathParameters.get("project")); |
universe@138 | 89 | if (project == null) |
universe@138 | 90 | return; |
universe@138 | 91 | |
universe@138 | 92 | final var info = new ProjectInfo(project); |
universe@167 | 93 | info.setVersions(dao.listVersions(project)); |
universe@167 | 94 | info.setComponents(dao.listComponents(project)); |
universe@167 | 95 | info.setIssueSummary(dao.collectIssueSummary(project)); |
universe@138 | 96 | viewModel.setProjectInfo(info); |
universe@99 | 97 | |
universe@99 | 98 | // Select Version |
universe@138 | 99 | final var versionNode = pathParameters.get("version"); |
universe@161 | 100 | if (versionNode != null) { |
universe@161 | 101 | if ("no-version".equals(versionNode)) { |
universe@161 | 102 | viewModel.setVersionFilter(ProjectView.NO_VERSION); |
universe@161 | 103 | } else if ("all-versions".equals(versionNode)) { |
universe@161 | 104 | viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); |
universe@161 | 105 | } else { |
universe@167 | 106 | viewModel.setVersionFilter(dao.findVersionByNode(project, versionNode)); |
universe@161 | 107 | } |
universe@131 | 108 | } |
universe@131 | 109 | |
universe@131 | 110 | // Select Component |
universe@138 | 111 | final var componentNode = pathParameters.get("component"); |
universe@161 | 112 | if (componentNode != null) { |
universe@161 | 113 | if ("no-component".equals(componentNode)) { |
universe@161 | 114 | viewModel.setComponentFilter(ProjectView.NO_COMPONENT); |
universe@161 | 115 | } else if ("all-components".equals(componentNode)) { |
universe@161 | 116 | viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); |
universe@161 | 117 | } else { |
universe@167 | 118 | viewModel.setComponentFilter(dao.findComponentByNode(project, componentNode)); |
universe@161 | 119 | } |
universe@138 | 120 | } |
universe@138 | 121 | } |
universe@138 | 122 | |
universe@138 | 123 | private static String sanitizeNode(String node, String defaultValue) { |
universe@138 | 124 | String result = node == null || node.isBlank() ? defaultValue : node; |
universe@138 | 125 | result = result.replace('/', '-'); |
universe@138 | 126 | if (result.equals(".") || result.equals("..")) { |
universe@138 | 127 | return "_"+result; |
universe@138 | 128 | } else { |
universe@138 | 129 | return result; |
universe@129 | 130 | } |
universe@99 | 131 | } |
universe@99 | 132 | |
universe@157 | 133 | private void forwardView(HttpServletRequest req, HttpServletResponse resp, ProjectView viewModel, String name) throws ServletException, IOException { |
universe@99 | 134 | setViewModel(req, viewModel); |
universe@99 | 135 | setContentPage(req, name); |
universe@99 | 136 | setStylesheet(req, "projects"); |
universe@109 | 137 | setNavigationMenu(req, "project-navmenu"); |
universe@157 | 138 | renderSite(req, resp); |
universe@64 | 139 | } |
universe@64 | 140 | |
universe@61 | 141 | @RequestMapping(method = HttpMethod.GET) |
universe@167 | 142 | public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws ServletException, IOException { |
universe@99 | 143 | final var viewModel = new ProjectView(); |
universe@131 | 144 | populate(viewModel, null, dao); |
universe@86 | 145 | |
universe@99 | 146 | for (var info : viewModel.getProjectList()) { |
universe@167 | 147 | info.setVersions(dao.listVersions(info.getProject())); |
universe@167 | 148 | info.setIssueSummary(dao.collectIssueSummary(info.getProject())); |
universe@86 | 149 | } |
universe@86 | 150 | |
universe@157 | 151 | forwardView(req, resp, viewModel, "projects"); |
universe@45 | 152 | } |
universe@45 | 153 | |
universe@167 | 154 | private void configureProjectEditor(ProjectEditView viewModel, Project project, DataAccessObject dao) { |
universe@99 | 155 | viewModel.setProject(project); |
universe@167 | 156 | viewModel.setUsers(dao.listUsers()); |
universe@71 | 157 | } |
universe@71 | 158 | |
universe@131 | 159 | @RequestMapping(requestPath = "$project/edit", method = HttpMethod.GET) |
universe@167 | 160 | public void edit(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObject dao) throws IOException, SQLException, ServletException { |
universe@99 | 161 | final var viewModel = new ProjectEditView(); |
universe@131 | 162 | populate(viewModel, pathParams, dao); |
universe@47 | 163 | |
universe@134 | 164 | if (!viewModel.isProjectInfoPresent()) { |
universe@131 | 165 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 166 | return; |
universe@131 | 167 | } |
universe@47 | 168 | |
universe@131 | 169 | configureProjectEditor(viewModel, viewModel.getProjectInfo().getProject(), dao); |
universe@157 | 170 | forwardView(req, resp, viewModel, "project-form"); |
universe@131 | 171 | } |
universe@131 | 172 | |
universe@131 | 173 | @RequestMapping(requestPath = "create", method = HttpMethod.GET) |
universe@167 | 174 | public void create(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws SQLException, ServletException, IOException { |
universe@131 | 175 | final var viewModel = new ProjectEditView(); |
universe@131 | 176 | populate(viewModel, null, dao); |
universe@131 | 177 | configureProjectEditor(viewModel, new Project(-1), dao); |
universe@157 | 178 | forwardView(req, resp, viewModel, "project-form"); |
universe@47 | 179 | } |
universe@47 | 180 | |
universe@47 | 181 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
universe@167 | 182 | public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
universe@47 | 183 | |
universe@47 | 184 | try { |
universe@131 | 185 | final var project = new Project(getParameter(req, Integer.class, "pid").orElseThrow()); |
universe@47 | 186 | project.setName(getParameter(req, String.class, "name").orElseThrow()); |
universe@138 | 187 | |
universe@138 | 188 | final var node = getParameter(req, String.class, "node").orElse(null); |
universe@138 | 189 | project.setNode(sanitizeNode(node, project.getName())); |
universe@138 | 190 | |
universe@47 | 191 | getParameter(req, String.class, "description").ifPresent(project::setDescription); |
universe@47 | 192 | getParameter(req, String.class, "repoUrl").ifPresent(project::setRepoUrl); |
universe@47 | 193 | getParameter(req, Integer.class, "owner").map( |
universe@47 | 194 | ownerId -> ownerId >= 0 ? new User(ownerId) : null |
universe@47 | 195 | ).ifPresent(project::setOwner); |
universe@47 | 196 | |
mike@159 | 197 | if (project.getId() > 0) { |
universe@167 | 198 | dao.updateProject(project); |
mike@159 | 199 | } else { |
universe@167 | 200 | dao.insertProject(project); |
mike@159 | 201 | } |
universe@47 | 202 | |
universe@118 | 203 | setRedirectLocation(req, "./projects/"); |
universe@74 | 204 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
universe@59 | 205 | LOG.debug("Successfully updated project {}", project.getName()); |
universe@99 | 206 | |
universe@157 | 207 | renderSite(req, resp); |
mike@159 | 208 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
universe@131 | 209 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
universe@131 | 210 | // TODO: implement - fix issue #21 |
universe@47 | 211 | } |
universe@47 | 212 | } |
universe@47 | 213 | |
universe@134 | 214 | @RequestMapping(requestPath = "$project/$component/$version/issues/", method = HttpMethod.GET) |
universe@167 | 215 | public void issues(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObject dao) throws SQLException, IOException, ServletException { |
universe@99 | 216 | final var viewModel = new ProjectDetailsView(); |
universe@131 | 217 | populate(viewModel, pathParams, dao); |
universe@86 | 218 | |
universe@134 | 219 | if (!viewModel.isEveryFilterValid()) { |
universe@131 | 220 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 221 | return; |
universe@80 | 222 | } |
universe@47 | 223 | |
universe@134 | 224 | final var project = viewModel.getProjectInfo().getProject(); |
universe@134 | 225 | final var version = viewModel.getVersionFilter(); |
universe@134 | 226 | final var component = viewModel.getComponentFilter(); |
universe@134 | 227 | |
universe@167 | 228 | // TODO: use new IssueFilter class for the ViewModel |
universe@70 | 229 | |
universe@167 | 230 | final var projectFilter = new SpecificFilter<>(project); |
universe@167 | 231 | final IssueFilter filter; |
universe@134 | 232 | if (version.equals(ProjectView.NO_VERSION)) { |
universe@134 | 233 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
universe@167 | 234 | filter = new IssueFilter(projectFilter, |
universe@167 | 235 | new NoneFilter<>(), |
universe@167 | 236 | new AllFilter<>() |
universe@167 | 237 | ); |
universe@134 | 238 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
universe@167 | 239 | filter = new IssueFilter(projectFilter, |
universe@167 | 240 | new NoneFilter<>(), |
universe@167 | 241 | new NoneFilter<>() |
universe@167 | 242 | ); |
universe@134 | 243 | } else { |
universe@167 | 244 | filter = new IssueFilter(projectFilter, |
universe@167 | 245 | new NoneFilter<>(), |
universe@167 | 246 | new SpecificFilter<>(component) |
universe@167 | 247 | ); |
universe@134 | 248 | } |
universe@134 | 249 | } else if (version.equals(ProjectView.ALL_VERSIONS)) { |
universe@134 | 250 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
universe@167 | 251 | filter = new IssueFilter(projectFilter, |
universe@167 | 252 | new AllFilter<>(), |
universe@167 | 253 | new AllFilter<>() |
universe@167 | 254 | ); |
universe@134 | 255 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
universe@167 | 256 | filter = new IssueFilter(projectFilter, |
universe@167 | 257 | new AllFilter<>(), |
universe@167 | 258 | new NoneFilter<>() |
universe@167 | 259 | ); |
universe@134 | 260 | } else { |
universe@167 | 261 | filter = new IssueFilter(projectFilter, |
universe@167 | 262 | new AllFilter<>(), |
universe@167 | 263 | new SpecificFilter<>(component) |
universe@167 | 264 | ); |
universe@134 | 265 | } |
universe@134 | 266 | } else { |
universe@134 | 267 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
universe@167 | 268 | filter = new IssueFilter(projectFilter, |
universe@167 | 269 | new SpecificFilter<>(version), |
universe@167 | 270 | new AllFilter<>() |
universe@167 | 271 | ); |
universe@134 | 272 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
universe@167 | 273 | filter = new IssueFilter(projectFilter, |
universe@167 | 274 | new SpecificFilter<>(version), |
universe@167 | 275 | new NoneFilter<>() |
universe@167 | 276 | ); |
universe@134 | 277 | } else { |
universe@167 | 278 | filter = new IssueFilter(projectFilter, |
universe@167 | 279 | new SpecificFilter<>(version), |
universe@167 | 280 | new SpecificFilter<>(component) |
universe@167 | 281 | ); |
universe@134 | 282 | } |
universe@134 | 283 | } |
universe@134 | 284 | |
universe@167 | 285 | final var issues = dao.listIssues(filter); |
universe@121 | 286 | issues.sort(new IssueSorter( |
universe@141 | 287 | new IssueSorter.Criteria(IssueSorter.Field.DONE, true), |
universe@121 | 288 | new IssueSorter.Criteria(IssueSorter.Field.ETA, true), |
universe@121 | 289 | new IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) |
universe@121 | 290 | )); |
universe@134 | 291 | |
universe@134 | 292 | |
universe@134 | 293 | viewModel.getProjectDetails().updateDetails(issues); |
universe@134 | 294 | if (version.getId() > 0) |
universe@134 | 295 | viewModel.getProjectDetails().updateVersionInfo(version); |
universe@80 | 296 | |
universe@157 | 297 | forwardView(req, resp, viewModel, "project-details"); |
universe@71 | 298 | } |
universe@71 | 299 | |
universe@131 | 300 | @RequestMapping(requestPath = "$project/versions/", method = HttpMethod.GET) |
universe@167 | 301 | public void versions(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
universe@109 | 302 | final var viewModel = new VersionsView(); |
universe@131 | 303 | populate(viewModel, pathParameters, dao); |
universe@109 | 304 | |
universe@109 | 305 | final var projectInfo = viewModel.getProjectInfo(); |
universe@109 | 306 | if (projectInfo == null) { |
universe@131 | 307 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 308 | return; |
universe@109 | 309 | } |
universe@109 | 310 | |
universe@167 | 311 | final var issues = dao.listIssues( |
universe@167 | 312 | new IssueFilter( |
universe@167 | 313 | new SpecificFilter<>(projectInfo.getProject()), |
universe@167 | 314 | new AllFilter<>(), |
universe@167 | 315 | new AllFilter<>() |
universe@167 | 316 | ) |
universe@167 | 317 | ); |
universe@109 | 318 | viewModel.update(projectInfo.getVersions(), issues); |
universe@109 | 319 | |
universe@157 | 320 | forwardView(req, resp, viewModel, "versions"); |
universe@109 | 321 | } |
universe@109 | 322 | |
universe@131 | 323 | @RequestMapping(requestPath = "$project/versions/$version/edit", method = HttpMethod.GET) |
universe@167 | 324 | public void editVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
universe@99 | 325 | final var viewModel = new VersionEditView(); |
universe@131 | 326 | populate(viewModel, pathParameters, dao); |
universe@99 | 327 | |
universe@131 | 328 | if (viewModel.getProjectInfo() == null || viewModel.getVersionFilter() == null) { |
universe@131 | 329 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 330 | return; |
universe@110 | 331 | } |
universe@110 | 332 | |
universe@131 | 333 | viewModel.setVersion(viewModel.getVersionFilter()); |
universe@59 | 334 | |
universe@157 | 335 | forwardView(req, resp, viewModel, "version-form"); |
universe@59 | 336 | } |
universe@59 | 337 | |
universe@131 | 338 | @RequestMapping(requestPath = "$project/create-version", method = HttpMethod.GET) |
universe@167 | 339 | public void createVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
universe@131 | 340 | final var viewModel = new VersionEditView(); |
universe@131 | 341 | populate(viewModel, pathParameters, dao); |
universe@59 | 342 | |
universe@131 | 343 | if (viewModel.getProjectInfo() == null) { |
universe@131 | 344 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 345 | return; |
universe@131 | 346 | } |
universe@131 | 347 | |
universe@167 | 348 | viewModel.setVersion(new Version(-1, viewModel.getProjectInfo().getProject().getId())); |
universe@131 | 349 | |
universe@157 | 350 | forwardView(req, resp, viewModel, "version-form"); |
universe@131 | 351 | } |
universe@131 | 352 | |
universe@131 | 353 | @RequestMapping(requestPath = "commit-version", method = HttpMethod.POST) |
universe@167 | 354 | public void commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
universe@131 | 355 | |
universe@59 | 356 | try { |
universe@167 | 357 | final var project = dao.findProject(getParameter(req, Integer.class, "pid").orElseThrow()); |
universe@138 | 358 | if (project == null) { |
universe@138 | 359 | // TODO: improve error handling, because not found is not correct for this POST request |
universe@138 | 360 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 361 | return; |
universe@138 | 362 | } |
universe@167 | 363 | final var version = new Version(getParameter(req, Integer.class, "id").orElseThrow(), project.getId()); |
universe@59 | 364 | version.setName(getParameter(req, String.class, "name").orElseThrow()); |
universe@138 | 365 | |
universe@138 | 366 | final var node = getParameter(req, String.class, "node").orElse(null); |
universe@138 | 367 | version.setNode(sanitizeNode(node, version.getName())); |
universe@138 | 368 | |
universe@59 | 369 | getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal); |
universe@59 | 370 | version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow())); |
mike@159 | 371 | |
mike@159 | 372 | if (version.getId() > 0) { |
universe@167 | 373 | dao.updateVersion(version); |
mike@159 | 374 | } else { |
universe@167 | 375 | dao.insertVersion(version); |
mike@159 | 376 | } |
universe@59 | 377 | |
universe@138 | 378 | setRedirectLocation(req, "./projects/" + project.getNode() + "/versions/"); |
universe@74 | 379 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
universe@157 | 380 | |
universe@157 | 381 | renderSite(req, resp); |
mike@159 | 382 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
universe@131 | 383 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
universe@131 | 384 | // TODO: implement - fix issue #21 |
universe@59 | 385 | } |
universe@41 | 386 | } |
universe@64 | 387 | |
universe@134 | 388 | @RequestMapping(requestPath = "$project/components/", method = HttpMethod.GET) |
universe@167 | 389 | public void components(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
universe@134 | 390 | final var viewModel = new ComponentsView(); |
universe@134 | 391 | populate(viewModel, pathParameters, dao); |
universe@134 | 392 | |
universe@134 | 393 | final var projectInfo = viewModel.getProjectInfo(); |
universe@134 | 394 | if (projectInfo == null) { |
universe@134 | 395 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 396 | return; |
universe@134 | 397 | } |
universe@134 | 398 | |
universe@167 | 399 | final var issues = dao.listIssues( |
universe@167 | 400 | new IssueFilter( |
universe@167 | 401 | new SpecificFilter<>(projectInfo.getProject()), |
universe@167 | 402 | new AllFilter<>(), |
universe@167 | 403 | new AllFilter<>() |
universe@167 | 404 | ) |
universe@167 | 405 | ); |
universe@134 | 406 | viewModel.update(projectInfo.getComponents(), issues); |
universe@134 | 407 | |
universe@157 | 408 | forwardView(req, resp, viewModel, "components"); |
universe@134 | 409 | } |
universe@134 | 410 | |
universe@134 | 411 | @RequestMapping(requestPath = "$project/components/$component/edit", method = HttpMethod.GET) |
universe@167 | 412 | public void editComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
universe@134 | 413 | final var viewModel = new ComponentEditView(); |
universe@134 | 414 | populate(viewModel, pathParameters, dao); |
universe@134 | 415 | |
universe@134 | 416 | if (viewModel.getProjectInfo() == null || viewModel.getComponentFilter() == null) { |
universe@134 | 417 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 418 | return; |
universe@134 | 419 | } |
universe@134 | 420 | |
universe@134 | 421 | viewModel.setComponent(viewModel.getComponentFilter()); |
universe@167 | 422 | viewModel.setUsers(dao.listUsers()); |
universe@134 | 423 | |
universe@157 | 424 | forwardView(req, resp, viewModel, "component-form"); |
universe@134 | 425 | } |
universe@134 | 426 | |
universe@134 | 427 | @RequestMapping(requestPath = "$project/create-component", method = HttpMethod.GET) |
universe@167 | 428 | public void createComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
universe@134 | 429 | final var viewModel = new ComponentEditView(); |
universe@134 | 430 | populate(viewModel, pathParameters, dao); |
universe@134 | 431 | |
universe@134 | 432 | if (viewModel.getProjectInfo() == null) { |
universe@134 | 433 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 434 | return; |
universe@134 | 435 | } |
universe@134 | 436 | |
universe@167 | 437 | viewModel.setComponent(new Component(-1, viewModel.getProjectInfo().getProject().getId())); |
universe@167 | 438 | viewModel.setUsers(dao.listUsers()); |
universe@134 | 439 | |
universe@157 | 440 | forwardView(req, resp, viewModel, "component-form"); |
universe@134 | 441 | } |
universe@134 | 442 | |
universe@134 | 443 | @RequestMapping(requestPath = "commit-component", method = HttpMethod.POST) |
universe@167 | 444 | public void commitComponent(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
universe@134 | 445 | |
universe@134 | 446 | try { |
universe@167 | 447 | final var project = dao.findProject(getParameter(req, Integer.class, "pid").orElseThrow()); |
universe@138 | 448 | if (project == null) { |
universe@138 | 449 | // TODO: improve error handling, because not found is not correct for this POST request |
universe@138 | 450 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 451 | return; |
universe@138 | 452 | } |
universe@167 | 453 | final var component = new Component(getParameter(req, Integer.class, "id").orElseThrow(), project.getId()); |
universe@134 | 454 | component.setName(getParameter(req, String.class, "name").orElseThrow()); |
universe@138 | 455 | |
universe@138 | 456 | final var node = getParameter(req, String.class, "node").orElse(null); |
universe@138 | 457 | component.setNode(sanitizeNode(node, component.getName())); |
universe@138 | 458 | |
universe@134 | 459 | component.setColor(getParameter(req, WebColor.class, "color").orElseThrow()); |
universe@134 | 460 | getParameter(req, Integer.class, "ordinal").ifPresent(component::setOrdinal); |
universe@134 | 461 | getParameter(req, Integer.class, "lead").map( |
universe@134 | 462 | userid -> userid >= 0 ? new User(userid) : null |
universe@134 | 463 | ).ifPresent(component::setLead); |
universe@134 | 464 | getParameter(req, String.class, "description").ifPresent(component::setDescription); |
universe@134 | 465 | |
mike@159 | 466 | if (component.getId() > 0) { |
universe@167 | 467 | dao.updateComponent(component); |
mike@159 | 468 | } else { |
universe@167 | 469 | dao.insertComponent(component); |
mike@159 | 470 | } |
universe@134 | 471 | |
universe@138 | 472 | setRedirectLocation(req, "./projects/" + project.getNode() + "/components/"); |
universe@134 | 473 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
universe@157 | 474 | |
universe@157 | 475 | renderSite(req, resp); |
mike@159 | 476 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
universe@134 | 477 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
universe@134 | 478 | // TODO: implement - fix issue #21 |
universe@134 | 479 | } |
universe@134 | 480 | } |
universe@134 | 481 | |
universe@167 | 482 | private void configureIssueEditor(IssueEditView viewModel, Issue issue, DataAccessObject dao) { |
universe@134 | 483 | final var project = viewModel.getProjectInfo().getProject(); |
universe@146 | 484 | issue.setProject(project); // automatically set current project for new issues |
universe@99 | 485 | viewModel.setIssue(issue); |
universe@99 | 486 | viewModel.configureVersionSelectors(viewModel.getProjectInfo().getVersions()); |
universe@167 | 487 | viewModel.setUsers(dao.listUsers()); |
universe@167 | 488 | viewModel.setComponents(dao.listComponents(project)); |
universe@71 | 489 | } |
universe@71 | 490 | |
universe@146 | 491 | @RequestMapping(requestPath = "$project/issues/$issue/view", method = HttpMethod.GET) |
universe@167 | 492 | public void viewIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
universe@146 | 493 | final var viewModel = new IssueDetailView(); |
universe@146 | 494 | populate(viewModel, pathParameters, dao); |
universe@146 | 495 | |
universe@146 | 496 | final var projectInfo = viewModel.getProjectInfo(); |
universe@146 | 497 | if (projectInfo == null) { |
universe@146 | 498 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 499 | return; |
universe@146 | 500 | } |
universe@146 | 501 | |
universe@167 | 502 | final var issue = dao.findIssue(parseIntOrZero(pathParameters.get("issue"))); |
universe@146 | 503 | if (issue == null) { |
universe@146 | 504 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 505 | return; |
universe@146 | 506 | } |
universe@146 | 507 | |
universe@146 | 508 | viewModel.setIssue(issue); |
universe@167 | 509 | viewModel.setComments(dao.listComments(issue)); |
universe@146 | 510 | |
universe@162 | 511 | viewModel.processMarkdown(); |
universe@162 | 512 | |
universe@157 | 513 | forwardView(req, resp, viewModel, "issue-view"); |
universe@146 | 514 | } |
universe@146 | 515 | |
universe@146 | 516 | // TODO: why should the issue editor be child of $project? |
universe@131 | 517 | @RequestMapping(requestPath = "$project/issues/$issue/edit", method = HttpMethod.GET) |
universe@167 | 518 | public void editIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
universe@99 | 519 | final var viewModel = new IssueEditView(); |
universe@131 | 520 | populate(viewModel, pathParameters, dao); |
universe@99 | 521 | |
universe@131 | 522 | final var projectInfo = viewModel.getProjectInfo(); |
universe@131 | 523 | if (projectInfo == null) { |
universe@131 | 524 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 525 | return; |
universe@86 | 526 | } |
universe@64 | 527 | |
universe@167 | 528 | final var issue = dao.findIssue(parseIntOrZero(pathParameters.get("issue"))); |
universe@131 | 529 | if (issue == null) { |
universe@131 | 530 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 531 | return; |
universe@131 | 532 | } |
universe@131 | 533 | |
universe@133 | 534 | configureIssueEditor(viewModel, issue, dao); |
universe@131 | 535 | |
universe@157 | 536 | forwardView(req, resp, viewModel, "issue-form"); |
universe@64 | 537 | } |
universe@64 | 538 | |
universe@131 | 539 | @RequestMapping(requestPath = "$project/create-issue", method = HttpMethod.GET) |
universe@167 | 540 | public void createIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
universe@131 | 541 | final var viewModel = new IssueEditView(); |
universe@131 | 542 | populate(viewModel, pathParameters, dao); |
universe@131 | 543 | |
universe@131 | 544 | final var projectInfo = viewModel.getProjectInfo(); |
universe@131 | 545 | if (projectInfo == null) { |
universe@131 | 546 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 547 | return; |
universe@131 | 548 | } |
universe@131 | 549 | |
universe@167 | 550 | // TODO: fix #38 - automatically select component (and version) |
universe@167 | 551 | final var issue = new Issue(-1, projectInfo.getProject(), null); |
universe@131 | 552 | issue.setProject(projectInfo.getProject()); |
universe@133 | 553 | configureIssueEditor(viewModel, issue, dao); |
universe@131 | 554 | |
universe@157 | 555 | forwardView(req, resp, viewModel, "issue-form"); |
universe@131 | 556 | } |
universe@131 | 557 | |
universe@131 | 558 | @RequestMapping(requestPath = "commit-issue", method = HttpMethod.POST) |
universe@167 | 559 | public void commitIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
universe@64 | 560 | try { |
universe@167 | 561 | final var project = dao.findProject(getParameter(req, Integer.class, "pid").orElseThrow()); |
universe@138 | 562 | if (project == null) { |
universe@138 | 563 | // TODO: improve error handling, because not found is not correct for this POST request |
universe@138 | 564 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 565 | return; |
universe@138 | 566 | } |
universe@167 | 567 | final var componentId = getParameter(req, Integer.class, "component"); |
universe@167 | 568 | final Component component; |
universe@167 | 569 | if (componentId.isPresent()) { |
universe@167 | 570 | component = dao.findComponent(componentId.get()); |
universe@167 | 571 | } else { |
universe@167 | 572 | component = null; |
universe@167 | 573 | } |
universe@167 | 574 | final var issue = new Issue(getParameter(req, Integer.class, "id").orElseThrow(), project, component); |
universe@75 | 575 | getParameter(req, String.class, "category").map(IssueCategory::valueOf).ifPresent(issue::setCategory); |
universe@75 | 576 | getParameter(req, String.class, "status").map(IssueStatus::valueOf).ifPresent(issue::setStatus); |
universe@75 | 577 | issue.setSubject(getParameter(req, String.class, "subject").orElseThrow()); |
universe@136 | 578 | getParameter(req, Integer.class, "assignee").map(userid -> { |
universe@136 | 579 | if (userid >= 0) { |
universe@136 | 580 | return new User(userid); |
universe@136 | 581 | } else if (userid == -2) { |
universe@136 | 582 | return Optional.ofNullable(component).map(Component::getLead).orElse(null); |
universe@136 | 583 | } else { |
universe@136 | 584 | return null; |
universe@136 | 585 | } |
universe@136 | 586 | } |
universe@75 | 587 | ).ifPresent(issue::setAssignee); |
universe@75 | 588 | getParameter(req, String.class, "description").ifPresent(issue::setDescription); |
universe@75 | 589 | getParameter(req, Date.class, "eta").ifPresent(issue::setEta); |
universe@83 | 590 | |
universe@83 | 591 | getParameter(req, Integer[].class, "affected") |
universe@83 | 592 | .map(Stream::of) |
universe@83 | 593 | .map(stream -> |
universe@167 | 594 | stream.map(id -> new Version(id, project.getId())) |
universe@167 | 595 | .collect(Collectors.toList()) |
universe@83 | 596 | ).ifPresent(issue::setAffectedVersions); |
universe@83 | 597 | getParameter(req, Integer[].class, "resolved") |
universe@83 | 598 | .map(Stream::of) |
universe@83 | 599 | .map(stream -> |
universe@167 | 600 | stream.map(id -> new Version(id, project.getId())) |
universe@167 | 601 | .collect(Collectors.toList()) |
universe@83 | 602 | ).ifPresent(issue::setResolvedVersions); |
universe@83 | 603 | |
mike@159 | 604 | if (issue.getId() > 0) { |
universe@167 | 605 | dao.updateIssue(issue); |
mike@159 | 606 | } else { |
universe@167 | 607 | dao.insertIssue(issue); |
mike@159 | 608 | } |
universe@64 | 609 | |
universe@167 | 610 | // TODO: implement #110 |
universe@146 | 611 | setRedirectLocation(req, "./projects/" + issue.getProject().getNode()+"/issues/"+issue.getId()+"/view"); |
universe@74 | 612 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
universe@124 | 613 | |
universe@157 | 614 | renderSite(req, resp); |
mike@159 | 615 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
universe@131 | 616 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
universe@131 | 617 | // TODO: implement - fix issue #21 |
universe@64 | 618 | } |
universe@124 | 619 | } |
universe@64 | 620 | |
universe@131 | 621 | @RequestMapping(requestPath = "commit-issue-comment", method = HttpMethod.POST) |
universe@167 | 622 | public void commentIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
universe@124 | 623 | final var issueIdParam = getParameter(req, Integer.class, "issueid"); |
universe@124 | 624 | if (issueIdParam.isEmpty()) { |
universe@124 | 625 | resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Detected manipulated form."); |
universe@157 | 626 | return; |
universe@124 | 627 | } |
universe@167 | 628 | final var issue = dao.findIssue(issueIdParam.get()); |
universe@137 | 629 | if (issue == null) { |
universe@137 | 630 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
universe@157 | 631 | return; |
universe@137 | 632 | } |
universe@124 | 633 | try { |
universe@167 | 634 | final var issueComment = new IssueComment(getParameter(req, Integer.class, "commentid").orElse(-1), issue.getId()); |
universe@124 | 635 | issueComment.setComment(getParameter(req, String.class, "comment").orElse("")); |
universe@124 | 636 | |
universe@124 | 637 | if (issueComment.getComment().isBlank()) { |
universe@124 | 638 | throw new IllegalArgumentException("comment.null"); |
universe@124 | 639 | } |
universe@124 | 640 | |
universe@124 | 641 | LOG.debug("User {} is commenting on issue #{}", req.getRemoteUser(), issue.getId()); |
universe@124 | 642 | if (req.getRemoteUser() != null) { |
universe@167 | 643 | Optional.ofNullable(dao.findUserByName(req.getRemoteUser())).ifPresent(issueComment::setAuthor); |
universe@124 | 644 | } |
universe@124 | 645 | |
universe@167 | 646 | dao.insertComment(issueComment); |
universe@124 | 647 | |
universe@146 | 648 | setRedirectLocation(req, "./projects/" + issue.getProject().getNode()+"/issues/"+issue.getId()+"/view"); |
universe@124 | 649 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
universe@124 | 650 | |
universe@157 | 651 | renderSite(req, resp); |
mike@159 | 652 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
universe@131 | 653 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
universe@131 | 654 | // TODO: implement - fix issue #21 |
universe@124 | 655 | } |
universe@64 | 656 | } |
universe@41 | 657 | } |