Merge pull request #68 from aquality-automation/feature/new_dashboard

Feature/new dashboard

Author: VladislavKostyukevich

src/main/java/main/controllers/Project/IssueController.java

@@ -32,7 +32,7 @@ public IssueController(UserDto user) {
     }
     @Override
     public List<IssueDto> get(IssueDto entity) throws AqualityException {
-        if (baseUser.isManager() || baseUser.getProjectUser(entity.getProject_id()).isViewer()) {
+        if (baseUser.isManager() || baseUser.isAuditAdmin() || baseUser.isAuditor() || baseUser.getProjectUser(entity.getProject_id()).isViewer()) {
             return fillIssues(issueDao.searchAll(entity));
         } else {
             throw new AqualityPermissionsException("Account is not allowed to view Issues", baseUser);

src/main/java/main/controllers/Project/TestRunController.java

@@ -89,13 +89,21 @@ public TestRunDto getLastSuiteTestRun(Integer suiteId, Integer projectId) throws
 
     @Override
     public boolean delete(TestRunDto template) throws AqualityException {
-        if (baseUser.isManager() || baseUser.getProjectUser(template.getProject_id()).isEditor()) {
+        if (baseUser.isManager() || baseUser.getProjectUser(template.getProject_id()).isAdminOrManager()) {
             return testRunDao.delete(template);
         } else {
             throw new AqualityPermissionsException("Account is not allowed to delete Test Run", baseUser);
         }
     }
 
+    public boolean delete(List<TestRunDto> template) throws AqualityException {
+        if (baseUser.isManager() || baseUser.getProjectUser(template.get(0).getProject_id()).isAdminOrManager()) {
+            return testRunDao.deleteMultiply(template);
+        } else {
+            throw new AqualityPermissionsException("Account is not allowed to delete Test Run", baseUser);
+        }
+    }
+
     private void createPendingResults(TestRunDto testRunTemplate) throws AqualityException {
         TestDto testTemplate = new TestDto();
         testTemplate.setTest_suite_id(testRunTemplate.getTest_suite_id());

src/main/java/main/model/dto/project/ProjectUserDto.java

@@ -50,4 +50,8 @@ public boolean isViewer(){
     public boolean isEditor() {
         return isAdmin() || isManager() || isEngineer();
     }
+
+    public boolean isAdminOrManager() {
+        return isAdmin() || isManager();
+    }
 }

src/main/java/main/view/BaseServlet.java

@@ -84,9 +84,6 @@ protected void setPostResponseHeaders(@NotNull HttpServletResponse resp) {
         resp.addHeader("Access-Control-Allow-Methods", "Post");
         resp.addHeader("Access-Control-Allow-Origin", "*");
         resp.addHeader("Access-Control-Allow-Headers", "Authorization");
-        resp.addHeader("Access-Control-Allow-Credentials", "true");
-        resp.addHeader("Access-Control-Expose-Headers", "ErrorMessage");
-        resp.addHeader("Access-Control-Allow-Headers", "ErrorMessage");
     }
 
     protected void setEncoding(@NotNull HttpServletResponse resp) {
@@ -101,28 +98,20 @@ protected void setDeleteResponseHeaders(@NotNull HttpServletResponse resp) {
         resp.addHeader("Access-Control-Allow-Methods", "Delete");
         resp.addHeader("Access-Control-Allow-Origin", "*");
         resp.addHeader("Access-Control-Allow-Headers", "Authorization");
-        resp.addHeader("Access-Control-Allow-Credentials", "true");
-        resp.addHeader("Access-Control-Expose-Headers", "ErrorMessage");
-        resp.addHeader("Access-Control-Allow-Headers", "ErrorMessage");
     }
 
     protected void setGetResponseHeaders(@NotNull HttpServletResponse resp) {
         resp.addHeader("Access-Control-Allow-Methods", "Get");
         resp.addHeader("Access-Control-Allow-Origin", "*");
         resp.addHeader("Access-Control-Allow-Headers", "Authorization");
-        resp.addHeader("Access-Control-Allow-Credentials", "true");
-        resp.addHeader("Access-Control-Expose-Headers", "ErrorMessage");
-        resp.addHeader("Access-Control-Allow-Headers", "ErrorMessage");
         resp.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
         resp.addHeader("Access-Control-Allow-Headers", "Content-Disposition");
     }
 
     protected void setOptionsResponseHeaders(@NotNull HttpServletResponse resp) {
         resp.addHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS, PUT, DELETE");
         resp.addHeader("Access-Control-Allow-Origin", "*");
-        resp.addHeader("Access-Control-Allow-Headers", "Authorization, authorization, ErrorMessage, Disposition");
-        resp.addHeader("Access-Control-Allow-Credentials", "true");
-        resp.addHeader("Access-Control-Expose-Headers", "ErrorMessage");
+        resp.addHeader("Access-Control-Allow-Headers", "Authorization, authorization, Disposition, Content-Type");
         resp.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
         resp.setStatus(204);
     }

src/main/java/main/view/Project/TestRunServlet.java

@@ -44,10 +44,15 @@ public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
         setDeleteResponseHeaders(resp);
         try {
             Session session = createSession(req);
-            TestRunDto testRun = new TestRunDto();
-            testRun.setId(Integer.parseInt(req.getParameter("id")));
-            testRun.setProject_id(getProjectId(req));
-            session.controllerFactory.getHandler(testRun).delete(testRun);
+            String requestedJson = getRequestJson(req);
+            if(requestedJson == null || requestedJson.isEmpty()) {
+                TestRunDto testRun = new TestRunDto();
+                testRun.getSearchTemplateFromRequestParameters(req);
+                session.controllerFactory.getHandler(testRun).delete(testRun);
+            } else {
+                List<TestRunDto> testRuns = mapper.mapObjects(TestRunDto.class, requestedJson);
+                session.controllerFactory.getHandler(testRuns.get(0)).delete(testRuns);
+            }
         }catch (Exception e) {
             handleException(resp, e);
         }