Add Sync permissions to Editors

Author: VladislavKostyukevich

src/main/java/main/controllers/Project/SuiteController.java

@@ -78,21 +78,33 @@ public List<SuiteStatisticDto> get(SuiteStatisticDto template) throws AqualityEx
         }
     }
 
-    private List<TestSuiteDto> fillTestSuites(List<TestSuiteDto> testSuites, boolean withChildren) throws AqualityException {
-        if(withChildren){
-            for (TestSuiteDto suite: testSuites){
-                TestDto testTemplate = new TestDto();
-                testTemplate.setTest_suite_id(suite.getId());
-                testTemplate.setProject_id(suite.getProject_id());
-                List<TestDto> tests = testController.get(testTemplate, false);
-                suite.setTests(tests);
+    public List<TestDto> findLegacyTests(Integer suiteId, Integer notExecutedFor) throws AqualityException {
+        if (baseUser.isManager() || baseUser.getProjectUserBySuiteId(suiteId).isEditor()) {
+            TestRunDto testRunTemplate = new TestRunDto();
+            testRunTemplate.setTest_suite_id(suiteId);
+            testRunTemplate.setLimit(notExecutedFor);
+            List<TestRunDto> testRuns = testRunDao.searchAll(testRunTemplate);
+            TestDto testTemplate = new TestDto();
+            testTemplate.setTest_suite_id(suiteId);
+            List<TestDto> tests = testController.get(testTemplate);
+            for (TestRunDto testRun : testRuns) {
+                TestResultDto testResultTemplate = new TestResultDto();
+                testResultTemplate.setTest_run_id(testRun.getId());
+                List<TestResultDto> testResults = testResultDao.searchAll(testResultTemplate);
+                tests = tests.stream().filter(test -> {
+                    TestResultDto currentResult = testResults.stream().filter(result -> result.getTest_id().equals(test.getId())).findFirst().orElse(null);
+                    return currentResult == null || currentResult.getFinal_result_id() == 3;
+                }).collect(Collectors.toList());
             }
+
+            return tests;
+        } else {
+            throw new AqualityPermissionsException("Account is not allowed to Sync Test Suite", baseUser);
         }
-        return testSuites;
     }
 
     public void syncLegacyTests(List<TestDto> legacyTests, Integer suiteId, boolean removeNotExecutedResults) throws AqualityException {
-        if(baseUser.isManager() || baseUser.getProjectUserBySuiteId(suiteId).isManager()){
+        if(baseUser.isManager() || baseUser.getProjectUserBySuiteId(suiteId).isEditor()){
             legacyTests.forEach(test -> {
                 Test2SuiteDto test2Suite = new Test2SuiteDto();
                 test2Suite.setTest_id(test.getId());
@@ -111,6 +123,19 @@ public void syncLegacyTests(List<TestDto> legacyTests, Integer suiteId, boolean
         }
     }
 
+    private List<TestSuiteDto> fillTestSuites(List<TestSuiteDto> testSuites, boolean withChildren) throws AqualityException {
+        if(withChildren){
+            for (TestSuiteDto suite: testSuites){
+                TestDto testTemplate = new TestDto();
+                testTemplate.setTest_suite_id(suite.getId());
+                testTemplate.setProject_id(suite.getProject_id());
+                List<TestDto> tests = testController.get(testTemplate, false);
+                suite.setTests(tests);
+            }
+        }
+        return testSuites;
+    }
+
     private void removePendingResultsForTest(Integer suiteId, Integer testId) throws AqualityException {
         List<TestResultDto> testResults = testResultDao.selectSuiteLegacyResults(suiteId, testId);
         testResults.forEach(testResult -> {
@@ -121,29 +146,4 @@ private void removePendingResultsForTest(Integer suiteId, Integer testId) throws
             }
         });
     }
-
-    public List<TestDto> findLegacyTests(Integer suiteId, Integer notExecutedFor) throws AqualityException {
-        if (baseUser.isManager() || baseUser.getProjectUserBySuiteId(suiteId).isManager()) {
-            TestRunDto testRunTemplate = new TestRunDto();
-            testRunTemplate.setTest_suite_id(suiteId);
-            testRunTemplate.setLimit(notExecutedFor);
-            List<TestRunDto> testRuns = testRunDao.searchAll(testRunTemplate);
-            TestDto testTemplate = new TestDto();
-            testTemplate.setTest_suite_id(suiteId);
-            List<TestDto> tests = testController.get(testTemplate);
-            for (TestRunDto testRun : testRuns) {
-                TestResultDto testResultTemplate = new TestResultDto();
-                testResultTemplate.setTest_run_id(testRun.getId());
-                List<TestResultDto> testResults = testResultDao.searchAll(testResultTemplate);
-                tests = tests.stream().filter(test -> {
-                    TestResultDto currentResult = testResults.stream().filter(result -> result.getTest_id().equals(test.getId())).findFirst().orElse(null);
-                    return currentResult == null || currentResult.getFinal_result_id() == 3;
-                }).collect(Collectors.toList());
-            }
-
-            return tests;
-        } else {
-            throw new AqualityPermissionsException("Account is not allowed to Sync Test Suite", baseUser);
-        }
-    }
 }