Merge pull request #57 from aquality-automation/feature/swagger_update

Feature/swagger update

Author: VladislavKostyukevich

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.3.8 (Unreleased)
+
+Features:
+  - [Doc] Update Swagger with Statistic endpoints -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/76)
+
 ## 0.3.7 (2020-03-02)
 
 Features:

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

@@ -62,7 +62,16 @@ public List<TestRunLabelDto> get(TestRunLabelDto template) throws AqualityExcept
     }
 
     public List<TestRunStatisticDto> get(TestRunStatisticDto template) throws AqualityException {
-        return testRunStatisticDao.searchAll(template);
+        TestRunDto testRunDto = new TestRunDto();
+        testRunDto.setId(template.getId());
+        Integer projectId = template.getId() != null
+            ? testRunDto.getProjectIdById()
+            : template.getProject_id();
+        if (baseUser.isFromGlobalManagement() || baseUser.getProjectUser(projectId).isViewer()) {
+            return testRunStatisticDao.searchAll(template);
+        } else {
+            throw new AqualityPermissionsException("Account is not allowed to view Test Run Statistic", baseUser);
+        }
     }
 
     public TestRunDto getLastSuiteTestRun(Integer suiteId, Integer projectId) throws AqualityException {

src/main/java/main/view/Project/TestResultStatisticServlet.java renamed to src/main/java/main/view/Project/statistic/TestResultStatisticServlet.java

@@ -1,4 +1,4 @@
-package main.view.Project;
+package main.view.Project.statistic;
 
 import main.Session;
 import main.model.dto.TestResultDto;

src/main/java/main/view/Project/TestRunStatisticServlet.java renamed to src/main/java/main/view/Project/statistic/TestRunStatisticServlet.java

@@ -1,4 +1,4 @@
-package main.view.Project;
+package main.view.Project.statistic;
 
 import main.Session;
 import main.model.dto.TestRunDto;

src/main/java/main/view/Project/TestSuiteStatServlet.java renamed to src/main/java/main/view/Project/statistic/TestSuiteStatisticServlet.java

@@ -1,4 +1,4 @@
-package main.view.Project;
+package main.view.Project.statistic;
 
 import main.Session;
 import main.model.dto.SuiteStatisticDto;
@@ -12,8 +12,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-@WebServlet("/suite/stat")
-public class TestSuiteStatServlet extends BaseServlet implements IGet {
+@WebServlet("/stats/suite")
+public class TestSuiteStatisticServlet extends BaseServlet implements IGet {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp){