Skip to content

Commit d42be4b

Browse files
committed
fixed some servlets
1 parent c1bbdc3 commit d42be4b

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/main/java/main/controllers/AuditController.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,15 @@ public AuditController(UserDto user) {
4646
@Override
4747
public List<AuditDto> get(AuditDto searchTemplate) throws AqualityException {
4848
List<AuditDto> audits = auditDao.searchAll(searchTemplate);
49-
if (baseUser.isFromGlobalManagement() || baseUser.getProjectUser(searchTemplate.getProject_id()).isViewer()) {
49+
Integer projectId;
50+
try {
51+
projectId = searchTemplate.getId() == null
52+
? searchTemplate.getProject_id()
53+
: audits.get(0).getProject_id();
54+
} catch (IndexOutOfBoundsException e) {
55+
throw new AqualityException("The Audit you trying to access is not present!");
56+
}
57+
if (baseUser.isFromGlobalManagement() || baseUser.getProjectUser(projectId).isViewer()) {
5058
return completeAudits(audits);
5159
} else {
5260
throw new AqualityPermissionsException("Account is not allowed to view Audits.", baseUser);

src/main/java/main/view/Audits/GetAuditsServlet.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp){
2020
setEncoding(resp);
2121

2222
try {
23-
validateAndGetProjectId(req);
2423
Session session = createSession(req);
2524
String requestedJson = getRequestJson(req);
2625
AuditDto audit = mapper.mapObject(AuditDto.class, requestedJson);

src/main/java/main/view/Project/ProjectUsersServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
2020
setEncoding(resp);
2121

2222
try {
23-
Integer projectId = validateAndGetProjectId(req);
2423
Session session = createSession(req);
2524
ProjectUserDto projectUserDto = new ProjectUserDto();
2625
Integer userId = getIntegerQueryParameter(req, "userId");
26+
Integer projectId = getProjectId(req, false);
2727
projectUserDto.setProject_id(projectId);
2828
projectUserDto.setUser_id(userId);
2929
List<ProjectUserDto> projectUsers = session.controllerFactory.getHandler(projectUserDto).get(projectUserDto);

0 commit comments

Comments
 (0)