Merge pull request #40 from aquality-automation/feature/42-sync-suite-feature-tests

Feature/42 sync suite feature tests

Author: VladislavKostyukevich

src/main/java/main/controllers/Project/TestController.java

@@ -46,10 +46,10 @@ public TestDto create(TestDto template) throws AqualityException {
     }
 
     public List<TestDto> get(TestDto template, boolean withChildren) throws AqualityException {
-        if(baseUser.isFromGlobalManagement() || baseUser.getProjectUser(template.getProject_id()).isViewer()){
+        if(baseUser.isFromGlobalManagement() || baseUser.getProjectUserByTest(template).isViewer()){
             return fillTests(testDao.searchAll(template), withChildren);
         }else{
-            throw new AqualityPermissionsException("Account is not allowed to view Milestones", baseUser);
+            throw new AqualityPermissionsException("Account is not allowed to view Tests", baseUser);
         }
     }
 

src/main/java/main/model/dto/UserDto.java

@@ -7,6 +7,7 @@
 import main.annotations.DataBaseSearchable;
 import main.exceptions.AqualityException;
 import main.model.db.dao.project.MilestoneDao;
+import main.model.db.dao.project.TestDao;
 import main.model.db.dao.project.TestSuiteDao;
 import main.utils.BooleanUtil;
 
@@ -94,15 +95,10 @@ public boolean isFromGlobalManagement(){
     }
 
     public ProjectUserDto getProjectUser(Integer projectId){
-        ProjectUserDto emptyPU = new ProjectUserDto();
-        emptyPU.setViewer(0);
-        emptyPU.setAdmin(0);
-        emptyPU.setManager(0);
-        emptyPU.setEngineer(0);
         if(projectUsers != null){
-           return projectUsers.stream().filter(x -> x.getProject_id().equals(projectId)).findFirst().orElse(emptyPU);
+           return projectUsers.stream().filter(x -> x.getProject_id().equals(projectId)).findFirst().orElse(getEmptyProjectUser());
         }
-        return emptyPU;
+        return getEmptyProjectUser();
     }
 
     public ProjectUserDto getProjectUserBySuiteId(Integer suite_id) throws AqualityException {
@@ -113,6 +109,19 @@ public ProjectUserDto getProjectUserBySuiteId(Integer suite_id) throws AqualityE
         return getProjectUser(template.getProject_id());
     }
 
+    public ProjectUserDto getProjectUserByTest(TestDto testDto) throws AqualityException {
+        if(testDto.getProject_id() != null){
+            return getProjectUser(testDto.getProject_id());
+        }
+
+        try {
+            TestDao testDao = new TestDao();
+            return getProjectUser(testDao.searchAll(testDto).get(0).getProject_id());
+        }catch (IndexOutOfBoundsException e){
+            throw new AqualityException("Cannot define project id");
+        }
+    }
+
     public ProjectUserDto getProjectUserByMilestoneId(Integer milestone_id) throws AqualityException {
         MilestoneDao milestoneDao = new MilestoneDao();
         MilestoneDto template = new MilestoneDto();
@@ -126,4 +135,13 @@ public UserDto toPublic(){
         this.setSession_code("");
         return this;
     }
+
+    private ProjectUserDto getEmptyProjectUser(){
+        ProjectUserDto emptyPU = new ProjectUserDto();
+        emptyPU.setViewer(0);
+        emptyPU.setAdmin(0);
+        emptyPU.setManager(0);
+        emptyPU.setEngineer(0);
+        return emptyPU;
+    }
 }