Fri, 06 Nov 2020 10:50:32 +0100
migrates constants and removes global functions
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.*; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
33 | import de.uapcore.lightpit.dao.DataAccessObjects; |
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 | 38 | import org.slf4j.Logger; |
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 | 44 | import javax.servlet.http.HttpServletResponse; |
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 | 60 | private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class); |
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 | 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 | |
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
|
75 | private void populate(ProjectView viewModel, PathParameters pathParameters, DataAccessObjects dao) throws SQLException { |
99 | 76 | final var projectDao = dao.getProjectDao(); |
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 | 79 | |
80 | projectDao.list().stream().map(ProjectInfo::new).forEach(viewModel.getProjectList()::add); | |
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 | 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 | 95 | |
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"); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
98 | if ("no-version".equals(versionNode)) { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
99 | viewModel.setVersionFilter(ProjectView.NO_VERSION); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
100 | } else if ("all-versions".equals(versionNode)) { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
101 | viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
102 | } else { |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
103 | viewModel.setVersionFilter(versionDao.findByNode(project, versionNode)); |
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
|
104 | } |
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
|
105 | |
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 | // Select Component |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
107 | final var componentNode = pathParameters.get("component"); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
108 | if ("no-component".equals(componentNode)) { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
109 | viewModel.setComponentFilter(ProjectView.NO_COMPONENT); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
110 | } else if ("all-components".equals(componentNode)) { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
111 | viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
112 | } else { |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
113 | viewModel.setComponentFilter(componentDao.findByNode(project, componentNode)); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
114 | } |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
115 | } |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
116 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
117 | 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
|
118 | 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
|
119 | result = result.replace('/', '-'); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
120 | if (result.equals(".") || result.equals("..")) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
121 | return "_"+result; |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
122 | } else { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
123 | return result; |
129
a09d5c59351a
add components to navmenu
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
124 | } |
99 | 125 | } |
126 | ||
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
127 | private void forwardView(HttpServletRequest req, HttpServletResponse resp, ProjectView viewModel, String name) throws ServletException, IOException { |
99 | 128 | setViewModel(req, viewModel); |
129 | setContentPage(req, name); | |
130 | setStylesheet(req, "projects"); | |
109 | 131 | setNavigationMenu(req, "project-navmenu"); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
132 | renderSite(req, resp); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
133 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
134 | |
61
3e287f361c7a
moves project index to separate sub path
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
135 | @RequestMapping(method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
136 | public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException { |
99 | 137 | 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
|
138 | populate(viewModel, null, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
139 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
140 | final var projectDao = dao.getProjectDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
141 | final var versionDao = dao.getVersionDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
142 | |
99 | 143 | for (var info : viewModel.getProjectList()) { |
144 | info.setVersions(versionDao.list(info.getProject())); | |
145 | 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
|
146 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
147 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
148 | forwardView(req, resp, viewModel, "projects"); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
149 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
150 | |
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
|
151 | private void configureProjectEditor(ProjectEditView viewModel, Project project, DataAccessObjects dao) throws SQLException { |
99 | 152 | viewModel.setProject(project); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
153 | viewModel.setUsers(dao.getUserDao().list()); |
71 | 154 | } |
155 | ||
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
|
156 | @RequestMapping(requestPath = "$project/edit", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
157 | public void edit(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
99 | 158 | 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
|
159 | 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
|
160 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
161 | 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
|
162 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
163 | 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
|
164 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
165 | |
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 | configureProjectEditor(viewModel, viewModel.getProjectInfo().getProject(), dao); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
167 | 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
|
168 | } |
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
|
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 | @RequestMapping(requestPath = "create", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
171 | public void create(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects 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
|
172 | 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
|
173 | 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
|
174 | configureProjectEditor(viewModel, new Project(-1), dao); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
175 | 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
|
176 | } |
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
|
177 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
178 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
179 | public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, ServletException { |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
180 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
181 | 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
|
182 | 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
|
183 | 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
|
184 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
185 | 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
|
186 | project.setNode(sanitizeNode(node, project.getName())); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
187 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
188 | 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
|
189 | 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
|
190 | getParameter(req, Integer.class, "owner").map( |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
191 | 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
|
192 | ).ifPresent(project::setOwner); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
193 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
194 | dao.getProjectDao().saveOrUpdate(project); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
195 | |
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
|
196 | setRedirectLocation(req, "./projects/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
197 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
59 | 198 | LOG.debug("Successfully updated project {}", project.getName()); |
99 | 199 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
200 | renderSite(req, resp); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
201 | } catch (NoSuchElementException | IllegalArgumentException | SQLException 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
|
202 | 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
|
203 | // TODO: implement - fix issue #21 |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
204 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
205 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
206 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
207 | @RequestMapping(requestPath = "$project/$component/$version/issues/", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
208 | public void issues(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObjects dao) throws SQLException, IOException, ServletException { |
99 | 209 | 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
|
210 | populate(viewModel, pathParams, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
211 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
212 | 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
|
213 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
214 | return; |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
215 | } |
47
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 | final var project = viewModel.getProjectInfo().getProject(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
218 | final var version = viewModel.getVersionFilter(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
219 | final var component = viewModel.getComponentFilter(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
220 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
221 | 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
|
222 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
223 | final List<Issue> issues; |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
224 | if (version.equals(ProjectView.NO_VERSION)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
225 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
226 | issues = issueDao.list(project, (Version) null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
227 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
228 | issues = issueDao.list(project, null, null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
229 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
230 | issues = issueDao.list(project, component, null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
231 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
232 | } else if (version.equals(ProjectView.ALL_VERSIONS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
233 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
234 | issues = issueDao.list(project); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
235 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
236 | issues = issueDao.list(project, (Component)null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
237 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
238 | issues = issueDao.list(project, component); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
239 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
240 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
241 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
242 | issues = issueDao.list(project, version); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
243 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
244 | issues = issueDao.list(project, null, version); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
245 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
246 | issues = issueDao.list(project, component, version); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
247 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
248 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
249 | |
100
7e3c61c340d3
fixes issues and version information not set in correct order
Mike Becker <universe@uap-core.de>
parents:
99
diff
changeset
|
250 | 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
|
251 | 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
|
252 | 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
|
253 | 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
|
254 | 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
|
255 | )); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
256 | |
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 | viewModel.getProjectDetails().updateDetails(issues); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
259 | if (version.getId() > 0) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
260 | viewModel.getProjectDetails().updateVersionInfo(version); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
261 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
262 | forwardView(req, resp, viewModel, "project-details"); |
71 | 263 | } |
264 | ||
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
|
265 | @RequestMapping(requestPath = "$project/versions/", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
266 | public void versions(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
109 | 267 | 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
|
268 | populate(viewModel, pathParameters, dao); |
109 | 269 | |
270 | final var projectInfo = viewModel.getProjectInfo(); | |
271 | 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
|
272 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
273 | return; |
109 | 274 | } |
275 | ||
276 | final var issueDao = dao.getIssueDao(); | |
277 | final var issues = issueDao.list(projectInfo.getProject()); | |
278 | for (var issue : issues) issueDao.joinVersionInformation(issue); | |
279 | viewModel.update(projectInfo.getVersions(), issues); | |
280 | ||
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
281 | forwardView(req, resp, viewModel, "versions"); |
109 | 282 | } |
283 | ||
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
|
284 | @RequestMapping(requestPath = "$project/versions/$version/edit", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
285 | public void editVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
99 | 286 | 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
|
287 | populate(viewModel, pathParameters, dao); |
99 | 288 | |
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
|
289 | 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
|
290 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
291 | return; |
110
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
292 | } |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
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 | viewModel.setVersion(viewModel.getVersionFilter()); |
59 | 295 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
296 | forwardView(req, resp, viewModel, "version-form"); |
59 | 297 | } |
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 | @RequestMapping(requestPath = "$project/create-version", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
300 | public void createVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects 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
|
301 | 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
|
302 | populate(viewModel, pathParameters, dao); |
59 | 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 | 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
|
305 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
306 | 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
|
307 | } |
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
|
308 | |
152
7761c37c5e61
fixes default values for version and component form
Mike Becker <universe@uap-core.de>
parents:
150
diff
changeset
|
309 | 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
|
310 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
311 | 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
|
312 | } |
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
|
313 | |
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 | @RequestMapping(requestPath = "commit-version", method = HttpMethod.POST) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
315 | public void commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects 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
|
316 | |
59 | 317 | try { |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
318 | 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
|
319 | if (project == null) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
320 | // 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
|
321 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
322 | return; |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
323 | } |
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
|
324 | final var version = new Version(getParameter(req, Integer.class, "id").orElseThrow()); |
59 | 325 | 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
|
326 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
327 | 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
|
328 | version.setNode(sanitizeNode(node, version.getName())); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
329 | |
59 | 330 | getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal); |
331 | version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow())); | |
128
947d0f6a6a83
changes the way how to deal with child entities + adds component lead
Mike Becker <universe@uap-core.de>
parents:
124
diff
changeset
|
332 | dao.getVersionDao().saveOrUpdate(version, project); |
59 | 333 | |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
334 | setRedirectLocation(req, "./projects/" + project.getNode() + "/versions/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
335 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
336 | |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
337 | renderSite(req, resp); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
338 | } catch (NoSuchElementException | IllegalArgumentException | SQLException 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
|
339 | 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
|
340 | // TODO: implement - fix issue #21 |
59 | 341 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
342 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
343 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
344 | @RequestMapping(requestPath = "$project/components/", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
345 | public void components(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
346 | final var viewModel = new ComponentsView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
347 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
348 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
349 | final var projectInfo = viewModel.getProjectInfo(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
350 | if (projectInfo == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
351 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
352 | return; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
353 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
354 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
355 | final var issueDao = dao.getIssueDao(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
356 | final var issues = issueDao.list(projectInfo.getProject()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
357 | viewModel.update(projectInfo.getComponents(), issues); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
358 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
359 | forwardView(req, resp, viewModel, "components"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
360 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
361 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
362 | @RequestMapping(requestPath = "$project/components/$component/edit", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
363 | public void editComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
364 | final var viewModel = new ComponentEditView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
365 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
366 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
367 | if (viewModel.getProjectInfo() == null || viewModel.getComponentFilter() == 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 | viewModel.setComponent(viewModel.getComponentFilter()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
373 | viewModel.setUsers(dao.getUserDao().list()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
374 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
375 | forwardView(req, resp, viewModel, "component-form"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
376 | } |
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 | @RequestMapping(requestPath = "$project/create-component", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
379 | public void createComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
380 | final var viewModel = new ComponentEditView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
381 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
382 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
383 | if (viewModel.getProjectInfo() == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
384 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
385 | return; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
386 | } |
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 | viewModel.setComponent(new Component(-1)); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
389 | viewModel.setUsers(dao.getUserDao().list()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
390 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
391 | forwardView(req, resp, viewModel, "component-form"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
392 | } |
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 | @RequestMapping(requestPath = "commit-component", method = HttpMethod.POST) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
395 | public void commitComponent(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
396 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
397 | try { |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
398 | 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
|
399 | if (project == null) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
400 | // 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
|
401 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
402 | return; |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
403 | } |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
404 | 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
|
405 | 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
|
406 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
407 | 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
|
408 | component.setNode(sanitizeNode(node, component.getName())); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
409 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
410 | component.setColor(getParameter(req, WebColor.class, "color").orElseThrow()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
411 | getParameter(req, Integer.class, "ordinal").ifPresent(component::setOrdinal); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
412 | getParameter(req, Integer.class, "lead").map( |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
413 | userid -> userid >= 0 ? new User(userid) : null |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
414 | ).ifPresent(component::setLead); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
415 | getParameter(req, String.class, "description").ifPresent(component::setDescription); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
416 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
417 | dao.getComponentDao().saveOrUpdate(component, project); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
418 | |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
419 | setRedirectLocation(req, "./projects/" + project.getNode() + "/components/"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
420 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
421 | |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
422 | renderSite(req, resp); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
423 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
424 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
425 | // TODO: implement - fix issue #21 |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
426 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
427 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
428 | |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
429 | private void configureIssueEditor(IssueEditView viewModel, Issue issue, DataAccessObjects dao) throws SQLException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
430 | final var project = viewModel.getProjectInfo().getProject(); |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
431 | issue.setProject(project); // automatically set current project for new issues |
99 | 432 | viewModel.setIssue(issue); |
433 | viewModel.configureVersionSelectors(viewModel.getProjectInfo().getVersions()); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
434 | viewModel.setUsers(dao.getUserDao().list()); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
435 | viewModel.setComponents(dao.getComponentDao().list(project)); |
71 | 436 | } |
437 | ||
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
438 | @RequestMapping(requestPath = "$project/issues/$issue/view", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
439 | public void viewIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
440 | final var viewModel = new IssueDetailView(); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
441 | populate(viewModel, pathParameters, dao); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
442 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
443 | final var projectInfo = viewModel.getProjectInfo(); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
444 | if (projectInfo == null) { |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
445 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
446 | return; |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
447 | } |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
448 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
449 | final var issueDao = dao.getIssueDao(); |
158
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
450 | 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
|
451 | if (issue == null) { |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
452 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
453 | return; |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
454 | } |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
455 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
456 | issueDao.joinVersionInformation(issue); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
457 | viewModel.setIssue(issue); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
458 | viewModel.setComments(issueDao.listComments(issue)); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
459 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
460 | forwardView(req, resp, viewModel, "issue-view"); |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
461 | } |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
462 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
463 | // 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
|
464 | @RequestMapping(requestPath = "$project/issues/$issue/edit", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
465 | public void editIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException, ServletException { |
99 | 466 | 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
|
467 | populate(viewModel, pathParameters, dao); |
99 | 468 | |
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
|
469 | 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
|
470 | 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
|
471 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
472 | return; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
473 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
474 | |
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
|
475 | final var issueDao = dao.getIssueDao(); |
158
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
476 | 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
|
477 | 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
|
478 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
479 | 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
|
480 | } |
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
|
481 | |
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
|
482 | issueDao.joinVersionInformation(issue); |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
483 | 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
|
484 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
485 | 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
|
486 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
487 | |
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
|
488 | @RequestMapping(requestPath = "$project/create-issue", method = HttpMethod.GET) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
489 | public void createIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects 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
|
490 | 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
|
491 | 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
|
492 | |
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
|
493 | 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
|
494 | 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
|
495 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
496 | 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
|
497 | } |
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
|
498 | |
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
|
499 | 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
|
500 | issue.setProject(projectInfo.getProject()); |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
501 | 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
|
502 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
503 | 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
|
504 | } |
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 | @RequestMapping(requestPath = "commit-issue", method = HttpMethod.POST) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
507 | public void commitIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, ServletException { |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
508 | 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
|
509 | 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
|
510 | 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
|
511 | final Component component; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
512 | if (componentId.isPresent()) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
513 | 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
|
514 | } else { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
515 | component = null; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
516 | } |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
517 | 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
|
518 | if (project == null) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
519 | // 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
|
520 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
521 | return; |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
522 | } |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
523 | issue.setProject(project); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
524 | 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
|
525 | 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
|
526 | 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
|
527 | issue.setComponent(component); |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
528 | 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
|
529 | if (userid >= 0) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
530 | return new User(userid); |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
531 | } else if (userid == -2) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
532 | 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
|
533 | } else { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
534 | return null; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
535 | } |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
536 | } |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
537 | ).ifPresent(issue::setAssignee); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
538 | 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
|
539 | 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
|
540 | |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
541 | getParameter(req, Integer[].class, "affected") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
542 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
543 | .map(stream -> |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
544 | 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
|
545 | ).ifPresent(issue::setAffectedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
546 | getParameter(req, Integer[].class, "resolved") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
547 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
548 | .map(stream -> |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
549 | 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
|
550 | ).ifPresent(issue::setResolvedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
551 | |
128
947d0f6a6a83
changes the way how to deal with child entities + adds component lead
Mike Becker <universe@uap-core.de>
parents:
124
diff
changeset
|
552 | dao.getIssueDao().saveOrUpdate(issue, issue.getProject()); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
553 | |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
554 | // TODO: fix redirect location |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
555 | 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
|
556 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
124 | 557 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
558 | renderSite(req, resp); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
559 | } catch (NoSuchElementException | IllegalArgumentException | SQLException 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
|
560 | 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
|
561 | // 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
|
562 | } |
124 | 563 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
564 | |
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
|
565 | @RequestMapping(requestPath = "commit-issue-comment", method = HttpMethod.POST) |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
566 | public void commentIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException, ServletException { |
124 | 567 | final var issueIdParam = getParameter(req, Integer.class, "issueid"); |
568 | if (issueIdParam.isEmpty()) { | |
569 | resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Detected manipulated form."); | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
570 | return; |
124 | 571 | } |
137
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
572 | 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
|
573 | if (issue == null) { |
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
574 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
575 | return; |
137
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
576 | } |
124 | 577 | try { |
150
822b7e3d064d
migrate entities package
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
578 | final var issueComment = new IssueComment(getParameter(req, Integer.class, "commentid").orElse(-1)); |
124 | 579 | issueComment.setComment(getParameter(req, String.class, "comment").orElse("")); |
580 | ||
581 | if (issueComment.getComment().isBlank()) { | |
582 | throw new IllegalArgumentException("comment.null"); | |
583 | } | |
584 | ||
585 | LOG.debug("User {} is commenting on issue #{}", req.getRemoteUser(), issue.getId()); | |
586 | if (req.getRemoteUser() != null) { | |
587 | dao.getUserDao().findByUsername(req.getRemoteUser()).ifPresent(issueComment::setAuthor); | |
588 | } | |
589 | ||
150
822b7e3d064d
migrate entities package
Mike Becker <universe@uap-core.de>
parents:
146
diff
changeset
|
590 | dao.getIssueDao().saveComment(issue, issueComment); |
124 | 591 | |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
592 | // TODO: fix redirect location |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
593 | setRedirectLocation(req, "./projects/" + issue.getProject().getNode()+"/issues/"+issue.getId()+"/view"); |
124 | 594 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
595 | ||
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
596 | renderSite(req, resp); |
124 | 597 | } catch (NoSuchElementException | IllegalArgumentException | SQLException 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
|
598 | 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
|
599 | // TODO: implement - fix issue #21 |
124 | 600 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
601 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
602 | } |