src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java

Sat, 05 Dec 2020 13:05:00 +0100

author
Mike Becker <universe@uap-core.de>
date
Sat, 05 Dec 2020 13:05:00 +0100
changeset 162
2adc8623dd89
parent 161
3d9218457b62
child 167
3f30adba1c63
permissions
-rw-r--r--

enables markdown support in issue descriptions and comments - fixes #10

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

mercurial