Thu, 22 Oct 2020 12:00:34 +0200
fixes creation of redirect link when commenting an issue
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 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
41 | import javax.servlet.annotation.WebServlet; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
42 | import javax.servlet.http.HttpServletRequest; |
59 | 43 | import javax.servlet.http.HttpServletResponse; |
44 | import java.io.IOException; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
45 | import java.sql.Date; |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
46 | import java.sql.SQLException; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
47 | import java.util.List; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
48 | 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
|
49 | import java.util.Optional; |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
50 | import java.util.stream.Collectors; |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
51 | import java.util.stream.Stream; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
53 | @WebServlet( |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
54 | name = "ProjectsModule", |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | urlPatterns = "/projects/*" |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
56 | ) |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
57 | public final class ProjectsModule extends AbstractLightPITServlet { |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | |
59 | 59 | private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class); |
60 | ||
78
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
61 | @Override |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
62 | protected String getResourceBundleName() { |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
63 | return "localization.projects"; |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
64 | } |
71 | 65 | |
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
|
66 | private void populate(ProjectView viewModel, PathParameters pathParameters, DataAccessObjects dao) throws SQLException { |
99 | 67 | final var projectDao = dao.getProjectDao(); |
68 | final var versionDao = dao.getVersionDao(); | |
129
a09d5c59351a
add components to navmenu
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
69 | final var componentDao = dao.getComponentDao(); |
99 | 70 | |
71 | projectDao.list().stream().map(ProjectInfo::new).forEach(viewModel.getProjectList()::add); | |
72 | ||
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
|
73 | 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
|
74 | 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
|
75 | |
99 | 76 | // Select 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
|
77 | final int pid = Functions.parseIntOrZero(pathParameters.get("project")); |
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
|
78 | if (pid > 0) { |
99 | 79 | final var project = projectDao.find(pid); |
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
|
80 | if (project != null) { |
107
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
81 | final var info = new ProjectInfo(project); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
82 | info.setVersions(versionDao.list(project)); |
129
a09d5c59351a
add components to navmenu
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
83 | info.setComponents(componentDao.list(project)); |
107
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
84 | info.setIssueSummary(projectDao.getIssueSummary(project)); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
85 | viewModel.setProjectInfo(info); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
86 | } |
99 | 87 | } |
88 | ||
89 | // Select Version | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
90 | final var pathParamVersion = pathParameters.get("version"); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
91 | if ("no-version".equals(pathParamVersion)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
92 | viewModel.setVersionFilter(ProjectView.NO_VERSION); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
93 | } else if ("all-versions".equals(pathParamVersion)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
94 | viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
95 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
96 | final int vid = Functions.parseIntOrZero(pathParamVersion); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
97 | if (vid > 0) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
98 | viewModel.setVersionFilter(versionDao.find(vid)); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
99 | } |
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
|
100 | } |
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
|
101 | |
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
|
102 | // Select Component |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
103 | final var pathParamComponent = pathParameters.get("component"); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
104 | if ("no-component".equals(pathParamComponent)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
105 | viewModel.setComponentFilter(ProjectView.NO_COMPONENT); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
106 | } else if ("all-components".equals(pathParamComponent)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
107 | viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
108 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
109 | final int cid = Functions.parseIntOrZero(pathParamComponent); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
110 | if (cid > 0) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
111 | viewModel.setComponentFilter(componentDao.find(cid)); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
112 | } |
129
a09d5c59351a
add components to navmenu
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
113 | } |
99 | 114 | } |
115 | ||
116 | private ResponseType forwardView(HttpServletRequest req, ProjectView viewModel, String name) { | |
117 | setViewModel(req, viewModel); | |
118 | setContentPage(req, name); | |
119 | setStylesheet(req, "projects"); | |
109 | 120 | setNavigationMenu(req, "project-navmenu"); |
99 | 121 | return ResponseType.HTML; |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
122 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
123 | |
61
3e287f361c7a
moves project index to separate sub path
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
124 | @RequestMapping(method = HttpMethod.GET) |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
125 | public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
99 | 126 | 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
|
127 | populate(viewModel, null, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
128 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
129 | final var projectDao = dao.getProjectDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
130 | final var versionDao = dao.getVersionDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
131 | |
99 | 132 | for (var info : viewModel.getProjectList()) { |
133 | info.setVersions(versionDao.list(info.getProject())); | |
134 | 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
|
135 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
136 | |
99 | 137 | return forwardView(req, viewModel, "projects"); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
138 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
139 | |
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
|
140 | private void configureProjectEditor(ProjectEditView viewModel, Project project, DataAccessObjects dao) throws SQLException { |
99 | 141 | viewModel.setProject(project); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
142 | viewModel.setUsers(dao.getUserDao().list()); |
71 | 143 | } |
144 | ||
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
|
145 | @RequestMapping(requestPath = "$project/edit", method = HttpMethod.GET) |
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
|
146 | public ResponseType edit(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObjects dao) throws IOException, SQLException { |
99 | 147 | 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
|
148 | 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
|
149 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
150 | 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
|
151 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
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
|
152 | return ResponseType.NONE; |
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
|
153 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
154 | |
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
|
155 | configureProjectEditor(viewModel, viewModel.getProjectInfo().getProject(), 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
|
156 | return forwardView(req, viewModel, "project-form"); |
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
|
157 | } |
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
|
158 | |
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 | @RequestMapping(requestPath = "create", method = HttpMethod.GET) |
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 | public ResponseType create(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
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
|
161 | 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
|
162 | 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
|
163 | configureProjectEditor(viewModel, new Project(-1), dao); |
99 | 164 | return forwardView(req, 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
|
165 | } |
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
|
166 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
167 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
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 | public ResponseType commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException { |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
169 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
170 | 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
|
171 | 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
|
172 | project.setName(getParameter(req, String.class, "name").orElseThrow()); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
173 | 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
|
174 | 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
|
175 | getParameter(req, Integer.class, "owner").map( |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
176 | 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
|
177 | ).ifPresent(project::setOwner); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
178 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
179 | dao.getProjectDao().saveOrUpdate(project); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
180 | |
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
|
181 | setRedirectLocation(req, "./projects/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
182 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
59 | 183 | LOG.debug("Successfully updated project {}", project.getName()); |
99 | 184 | |
185 | return ResponseType.HTML; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
186 | } 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
|
187 | 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
|
188 | // TODO: implement - fix issue #21 |
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
|
189 | return ResponseType.NONE; |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
190 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
191 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
192 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
193 | @RequestMapping(requestPath = "$project/$component/$version/issues/", method = HttpMethod.GET) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
194 | public ResponseType issues(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObjects dao) throws SQLException, IOException { |
99 | 195 | 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
|
196 | populate(viewModel, pathParams, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
197 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
198 | 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
|
199 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
200 | return ResponseType.NONE; |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
201 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
202 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
203 | final var project = viewModel.getProjectInfo().getProject(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
204 | final var version = viewModel.getVersionFilter(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
205 | final var component = viewModel.getComponentFilter(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
206 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
207 | 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
|
208 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
209 | final List<Issue> issues; |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
210 | if (version.equals(ProjectView.NO_VERSION)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
211 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
212 | issues = issueDao.list(project, (Version) null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
213 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
214 | issues = issueDao.list(project, null, null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
215 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
216 | issues = issueDao.list(project, component, null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
217 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
218 | } else if (version.equals(ProjectView.ALL_VERSIONS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
219 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
220 | issues = issueDao.list(project); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
221 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
222 | issues = issueDao.list(project, (Component)null); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
223 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
224 | issues = issueDao.list(project, component); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
225 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
226 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
227 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
228 | issues = issueDao.list(project, version); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
229 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
230 | issues = issueDao.list(project, null, version); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
231 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
232 | issues = issueDao.list(project, component, version); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
233 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
234 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
235 | |
100
7e3c61c340d3
fixes issues and version information not set in correct order
Mike Becker <universe@uap-core.de>
parents:
99
diff
changeset
|
236 | 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
|
237 | issues.sort(new IssueSorter( |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
238 | new IssueSorter.Criteria(IssueSorter.Field.PHASE, true), |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
239 | 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
|
240 | 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
|
241 | )); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
242 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
243 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
244 | viewModel.getProjectDetails().updateDetails(issues); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
245 | if (version.getId() > 0) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
246 | viewModel.getProjectDetails().updateVersionInfo(version); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
247 | |
99 | 248 | return forwardView(req, viewModel, "project-details"); |
71 | 249 | } |
250 | ||
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
|
251 | @RequestMapping(requestPath = "$project/versions/", method = HttpMethod.GET) |
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
|
252 | public ResponseType versions(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
109 | 253 | 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
|
254 | populate(viewModel, pathParameters, dao); |
109 | 255 | |
256 | final var projectInfo = viewModel.getProjectInfo(); | |
257 | 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
|
258 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
109 | 259 | return ResponseType.NONE; |
260 | } | |
261 | ||
262 | final var issueDao = dao.getIssueDao(); | |
263 | final var issues = issueDao.list(projectInfo.getProject()); | |
264 | for (var issue : issues) issueDao.joinVersionInformation(issue); | |
265 | viewModel.update(projectInfo.getVersions(), issues); | |
266 | ||
267 | return forwardView(req, viewModel, "versions"); | |
268 | } | |
269 | ||
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
|
270 | @RequestMapping(requestPath = "$project/versions/$version/edit", method = HttpMethod.GET) |
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
|
271 | public ResponseType editVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
99 | 272 | 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
|
273 | populate(viewModel, pathParameters, dao); |
99 | 274 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
275 | 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
|
276 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
110
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
277 | return ResponseType.NONE; |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
278 | } |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
279 | |
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
|
280 | viewModel.setVersion(viewModel.getVersionFilter()); |
59 | 281 | |
99 | 282 | return forwardView(req, viewModel, "version-form"); |
59 | 283 | } |
284 | ||
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
|
285 | @RequestMapping(requestPath = "$project/create-version", method = HttpMethod.GET) |
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
|
286 | public ResponseType createVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
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 | 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
|
288 | populate(viewModel, pathParameters, dao); |
59 | 289 | |
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
|
290 | 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
|
291 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
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
|
292 | return ResponseType.NONE; |
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
|
293 | } |
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 | |
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
|
295 | viewModel.setVersion(viewModel.getVersionFilter()); |
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
|
296 | |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
297 | return forwardView(req, viewModel, "version-form"); |
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
|
298 | } |
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 | |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
300 | @RequestMapping(requestPath = "commit-version", method = HttpMethod.POST) |
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 | public ResponseType commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException { |
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 | |
59 | 303 | try { |
128
947d0f6a6a83
changes the way how to deal with child entities + adds component lead
Mike Becker <universe@uap-core.de>
parents:
124
diff
changeset
|
304 | final var project = new Project(getParameter(req, Integer.class, "pid").orElseThrow()); |
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
|
305 | final var version = new Version(getParameter(req, Integer.class, "id").orElseThrow()); |
59 | 306 | version.setName(getParameter(req, String.class, "name").orElseThrow()); |
307 | getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal); | |
308 | 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
|
309 | dao.getVersionDao().saveOrUpdate(version, project); |
59 | 310 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
311 | setRedirectLocation(req, "./projects/" + project.getId() + "/versions/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
312 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
313 | } 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
|
314 | 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
|
315 | // TODO: implement - fix issue #21 |
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 | return ResponseType.NONE; |
59 | 317 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
318 | |
43
9abf0bf44c7b
renames some crappy constants
Mike Becker <universe@uap-core.de>
parents:
42
diff
changeset
|
319 | return ResponseType.HTML; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
320 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
321 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
322 | @RequestMapping(requestPath = "$project/components/", method = HttpMethod.GET) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
323 | public ResponseType components(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
324 | final var viewModel = new ComponentsView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
325 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
326 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
327 | final var projectInfo = viewModel.getProjectInfo(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
328 | if (projectInfo == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
329 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
330 | return ResponseType.NONE; |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
331 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
332 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
333 | final var issueDao = dao.getIssueDao(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
334 | final var issues = issueDao.list(projectInfo.getProject()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
335 | viewModel.update(projectInfo.getComponents(), issues); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
336 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
337 | return forwardView(req, viewModel, "components"); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
338 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
339 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
340 | @RequestMapping(requestPath = "$project/components/$component/edit", method = HttpMethod.GET) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
341 | public ResponseType editComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
342 | final var viewModel = new ComponentEditView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
343 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
344 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
345 | if (viewModel.getProjectInfo() == null || viewModel.getComponentFilter() == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
346 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
347 | return ResponseType.NONE; |
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 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
350 | viewModel.setComponent(viewModel.getComponentFilter()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
351 | viewModel.setUsers(dao.getUserDao().list()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
352 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
353 | return forwardView(req, viewModel, "component-form"); |
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 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
356 | @RequestMapping(requestPath = "$project/create-component", method = HttpMethod.GET) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
357 | public ResponseType createComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
358 | final var viewModel = new ComponentEditView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
359 | populate(viewModel, pathParameters, dao); |
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 | if (viewModel.getProjectInfo() == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
362 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
363 | return ResponseType.NONE; |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
364 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
365 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
366 | viewModel.setComponent(new Component(-1)); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
367 | viewModel.setUsers(dao.getUserDao().list()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
368 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
369 | return forwardView(req, viewModel, "component-form"); |
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 | @RequestMapping(requestPath = "commit-component", method = HttpMethod.POST) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
373 | public ResponseType commitComponent(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
374 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
375 | try { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
376 | final var project = new Project(getParameter(req, Integer.class, "pid").orElseThrow()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
377 | 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
|
378 | component.setName(getParameter(req, String.class, "name").orElseThrow()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
379 | component.setColor(getParameter(req, WebColor.class, "color").orElseThrow()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
380 | getParameter(req, Integer.class, "ordinal").ifPresent(component::setOrdinal); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
381 | getParameter(req, Integer.class, "lead").map( |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
382 | userid -> userid >= 0 ? new User(userid) : null |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
383 | ).ifPresent(component::setLead); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
384 | getParameter(req, String.class, "description").ifPresent(component::setDescription); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
385 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
386 | dao.getComponentDao().saveOrUpdate(component, project); |
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 | setRedirectLocation(req, "./projects/" + project.getId() + "/components/"); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
389 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
390 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
391 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
392 | // TODO: implement - fix issue #21 |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
393 | return ResponseType.NONE; |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
394 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
395 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
396 | return ResponseType.HTML; |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
397 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
398 | |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
399 | 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
|
400 | final var project = viewModel.getProjectInfo().getProject(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
401 | issue.setProject(project); |
99 | 402 | viewModel.setIssue(issue); |
403 | viewModel.configureVersionSelectors(viewModel.getProjectInfo().getVersions()); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
404 | viewModel.setUsers(dao.getUserDao().list()); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
405 | viewModel.setComponents(dao.getComponentDao().list(project)); |
124 | 406 | if (issue.getId() >= 0) { |
407 | viewModel.setComments(dao.getIssueDao().listComments(issue)); | |
408 | } | |
71 | 409 | } |
410 | ||
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
|
411 | @RequestMapping(requestPath = "$project/issues/$issue/edit", method = HttpMethod.GET) |
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
|
412 | public ResponseType editIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
99 | 413 | 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
|
414 | populate(viewModel, pathParameters, dao); |
99 | 415 | |
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
|
416 | 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
|
417 | 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
|
418 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
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
|
419 | return ResponseType.NONE; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
420 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
421 | |
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
|
422 | final var issueDao = dao.getIssueDao(); |
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
|
423 | final var issue = issueDao.find(Functions.parseIntOrZero(pathParameters.get("issue"))); |
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
|
424 | 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
|
425 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
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
|
426 | return ResponseType.NONE; |
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
|
427 | } |
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
|
428 | |
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
|
429 | issueDao.joinVersionInformation(issue); |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
430 | 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
|
431 | |
99 | 432 | return forwardView(req, viewModel, "issue-form"); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
433 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
434 | |
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
|
435 | @RequestMapping(requestPath = "$project/create-issue", method = HttpMethod.GET) |
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
|
436 | public ResponseType createIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObjects dao) throws IOException, SQLException { |
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
|
437 | 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
|
438 | 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
|
439 | |
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
|
440 | 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
|
441 | 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
|
442 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
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
|
443 | return ResponseType.NONE; |
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
|
444 | } |
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
|
445 | |
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
|
446 | 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
|
447 | issue.setProject(projectInfo.getProject()); |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
448 | 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
|
449 | |
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
|
450 | return forwardView(req, viewModel, "issue-form"); |
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
|
451 | } |
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
|
452 | |
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
|
453 | @RequestMapping(requestPath = "commit-issue", method = HttpMethod.POST) |
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
|
454 | public ResponseType commitIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException { |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
455 | 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
|
456 | 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
|
457 | 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
|
458 | final Component component; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
459 | if (componentId.isPresent()) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
460 | 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
|
461 | } else { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
462 | component = null; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
463 | } |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
464 | issue.setProject(new Project(getParameter(req, Integer.class, "pid").orElseThrow())); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
465 | 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
|
466 | 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
|
467 | 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
|
468 | issue.setComponent(component); |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
469 | 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
|
470 | if (userid >= 0) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
471 | return new User(userid); |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
472 | } else if (userid == -2) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
473 | 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
|
474 | } else { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
475 | return null; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
476 | } |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
477 | } |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
478 | ).ifPresent(issue::setAssignee); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
479 | 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
|
480 | 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
|
481 | |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
482 | getParameter(req, Integer[].class, "affected") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
483 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
484 | .map(stream -> |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
485 | 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
|
486 | ).ifPresent(issue::setAffectedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
487 | getParameter(req, Integer[].class, "resolved") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
488 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
489 | .map(stream -> |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
490 | 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
|
491 | ).ifPresent(issue::setResolvedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
492 | |
128
947d0f6a6a83
changes the way how to deal with child entities + adds component lead
Mike Becker <universe@uap-core.de>
parents:
124
diff
changeset
|
493 | 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
|
494 | |
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
|
495 | // TODO: fix issue #14 |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
496 | setRedirectLocation(req, "./projects/" + issue.getProject().getId() + "/all-components/all-versions/issues/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
497 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
124 | 498 | |
499 | return ResponseType.HTML; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
500 | } 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
|
501 | 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
|
502 | // TODO: implement - fix issue #21 |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
503 | return ResponseType.NONE; |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
504 | } |
124 | 505 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
506 | |
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
|
507 | @RequestMapping(requestPath = "commit-issue-comment", method = HttpMethod.POST) |
124 | 508 | public ResponseType commentIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException { |
509 | final var issueIdParam = getParameter(req, Integer.class, "issueid"); | |
510 | if (issueIdParam.isEmpty()) { | |
511 | resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Detected manipulated form."); | |
512 | return ResponseType.NONE; | |
513 | } | |
137
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
514 | 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
|
515 | if (issue == null) { |
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
516 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
517 | return ResponseType.NONE; |
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
518 | } |
124 | 519 | try { |
520 | final var issueComment = new IssueComment(getParameter(req, Integer.class, "commentid").orElse(-1), issue); | |
521 | issueComment.setComment(getParameter(req, String.class, "comment").orElse("")); | |
522 | ||
523 | if (issueComment.getComment().isBlank()) { | |
524 | throw new IllegalArgumentException("comment.null"); | |
525 | } | |
526 | ||
527 | LOG.debug("User {} is commenting on issue #{}", req.getRemoteUser(), issue.getId()); | |
528 | if (req.getRemoteUser() != null) { | |
529 | dao.getUserDao().findByUsername(req.getRemoteUser()).ifPresent(issueComment::setAuthor); | |
530 | } | |
531 | ||
532 | dao.getIssueDao().saveComment(issueComment); | |
533 | ||
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
534 | // TODO: fix redirect location (e.g. after fixing #24) |
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
|
535 | setRedirectLocation(req, "./projects/" + issue.getProject().getId()+"/issues/"+issue.getId()+"/edit"); |
124 | 536 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
537 | ||
538 | return ResponseType.HTML; | |
539 | } 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
|
540 | 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
|
541 | // TODO: implement - fix issue #21 |
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
|
542 | return ResponseType.NONE; |
124 | 543 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
544 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
545 | } |