removed IProjectController

knysh · knysh · commit f7c72c7b8d75 · 2020-02-17T12:08:08.000+03:00
diff --git a/src/main/java/main/controllers/Administration/AppSettingsController.java b/src/main/java/main/controllers/Administration/AppSettingsController.java
@@ -1,7 +1,6 @@
 package main.controllers.Administration;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.settings.AppSettingsDao;
@@ -16,7 +15,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-public class AppSettingsController extends BaseController<AppSettingsDto> implements IController<AppSettingsDto> {
+public class AppSettingsController extends BaseController<AppSettingsDto> {
     private AppSettingsDao appSettingsDao;
     private LdapDao ldapDao;
 
diff --git a/src/main/java/main/controllers/Administration/EmailSettingsController.java b/src/main/java/main/controllers/Administration/EmailSettingsController.java
@@ -1,7 +1,6 @@
 package main.controllers.Administration;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.model.db.dao.settings.EmailSettingsDao;
 import main.model.dto.EmailSettingsDto;
@@ -10,7 +9,7 @@
 
 import java.util.List;
 
-public class EmailSettingsController extends BaseController<EmailSettingsDto> implements IController<EmailSettingsDto> {
+public class EmailSettingsController extends BaseController<EmailSettingsDto> {
     private EmailSettingsDao emailSettingsDao;
 
     public EmailSettingsController(UserDto user) {
diff --git a/src/main/java/main/controllers/Administration/StepTypeController.java b/src/main/java/main/controllers/Administration/StepTypeController.java
@@ -1,15 +1,14 @@
 package main.controllers.Administration;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.model.db.dao.project.StepTypeDao;
 import main.model.dto.StepTypeDto;
 import main.model.dto.UserDto;
 
 import java.util.List;
 
-public class StepTypeController extends BaseController<StepTypeDto> implements IController<StepTypeDto> {
+public class StepTypeController extends BaseController<StepTypeDto> {
     private StepTypeDao stepTypeDao;
 
     public StepTypeController(UserDto user) {
diff --git a/src/main/java/main/controllers/Administration/UserController.java b/src/main/java/main/controllers/Administration/UserController.java
@@ -2,7 +2,6 @@
 
 import com.mysql.cj.core.conf.url.ConnectionUrlParser;
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.PasswordDao;
@@ -25,7 +24,7 @@
 import java.util.Objects;
 import java.util.UUID;
 
-public class UserController extends BaseController<UserDto> implements IController<UserDto> {
+public class UserController extends BaseController<UserDto> {
     private UserDao userDao;
     private PasswordDao passwordDao;
     private UserSessionDao userSessionDao;
diff --git a/src/main/java/main/controllers/AuditController.java b/src/main/java/main/controllers/AuditController.java
@@ -18,7 +18,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class AuditController extends BaseController<AuditDto> implements IController<AuditDto> {
+public class AuditController extends BaseController<AuditDto> {
     private AuditDao auditDao;
     private AuditStatusDao auditStatusDao;
     private ServiceDao serviceDao;
diff --git a/src/main/java/main/controllers/BaseController.java b/src/main/java/main/controllers/BaseController.java
@@ -3,7 +3,7 @@
 import main.model.dto.BaseDto;
 import main.model.dto.UserDto;
 
-public abstract class BaseController<T extends BaseDto> {
+public abstract class BaseController<T extends BaseDto> implements IController<T>{
     protected UserDto baseUser;
     protected PermissionsChecker permissionsChecker;
 
diff --git a/src/main/java/main/controllers/CustomerController.java b/src/main/java/main/controllers/CustomerController.java
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class CustomerController extends BaseController<CustomerDto> implements IController<CustomerDto> {
+public class CustomerController extends BaseController<CustomerDto> {
     private CustomerDao customerDao;
     private UserDao userDao;
 
diff --git a/src/main/java/main/controllers/Project/APITokenController.java b/src/main/java/main/controllers/Project/APITokenController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.APITokenDao;
@@ -13,7 +12,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public class APITokenController extends BaseController<APITokenDto> implements IController<APITokenDto> {
+public class APITokenController extends BaseController<APITokenDto> {
     private APITokenDao apiTokenDao;
 
     public APITokenController(UserDto user) {
diff --git a/src/main/java/main/controllers/Project/BodyPatternController.java b/src/main/java/main/controllers/Project/BodyPatternController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.BodyPatternDao;
@@ -10,7 +9,7 @@
 
 import java.util.List;
 
-public class BodyPatternController extends BaseController<BodyPatternDto> implements IController<BodyPatternDto> {
+public class BodyPatternController extends BaseController<BodyPatternDto> {
     private BodyPatternDao bodyPatternDao;
 
     public BodyPatternController(UserDto user) {
diff --git a/src/main/java/main/controllers/Project/FinalResultController.java b/src/main/java/main/controllers/Project/FinalResultController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.FinalResultDao;
@@ -10,7 +9,7 @@
 
 import java.util.List;
 
-public class FinalResultController extends BaseController<FinalResultDto> implements IController<FinalResultDto> {
+public class FinalResultController extends BaseController<FinalResultDto> {
     private FinalResultDao finalResultDao;
 
     public FinalResultController(UserDto user) {
diff --git a/src/main/java/main/controllers/Project/ImportController.java b/src/main/java/main/controllers/Project/ImportController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.ImportDao;
@@ -11,7 +10,7 @@
 
 import java.util.List;
 
-public class ImportController extends BaseController<ImportDto> implements IController<ImportDto> {
+public class ImportController extends BaseController<ImportDto> {
     private ImportDao importDao;
 
     public ImportController(UserDto user) {
diff --git a/src/main/java/main/controllers/Project/MilestoneController.java b/src/main/java/main/controllers/Project/MilestoneController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.MilestoneDao;
@@ -10,7 +9,7 @@
 
 import java.util.List;
 
-public class MilestoneController extends BaseController<MilestoneDto> implements IController<MilestoneDto> {
+public class MilestoneController extends BaseController<MilestoneDto> {
     private MilestoneDao milestoneDao;
 
     public MilestoneController(UserDto user) {
@@ -38,7 +37,7 @@ public List<MilestoneDto> get(MilestoneDto template) throws AqualityException {
 
     @Override
     public boolean delete(MilestoneDto template) throws AqualityException {
-        if (baseUser.isManager() || baseUser.getProjectUserByMilestoneId(template.getId()).isEditor()) {
+        if (baseUser.isManager() || baseUser.getProjectUser(template.getProject_id()).isEditor()) {
             return milestoneDao.delete(template);
         } else {
             throw new AqualityPermissionsException("Account is not allowed to delete Milestones", baseUser);
diff --git a/src/main/java/main/controllers/Project/PredefinedResolutionController.java b/src/main/java/main/controllers/Project/PredefinedResolutionController.java
@@ -1,15 +1,14 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.PredefinedResolutionDao;
 import main.model.dto.*;
 
 import java.util.List;
 
-public class PredefinedResolutionController extends BaseController<PredefinedResolutionDto> implements IController<PredefinedResolutionDto> {
+public class PredefinedResolutionController extends BaseController<PredefinedResolutionDto> {
     private PredefinedResolutionDao predefinedResolutionDao;
     private ProjectUserController projectUserController;
     private ResultResolutionController resultResolutionController;
diff --git a/src/main/java/main/controllers/Project/ProjectController.java b/src/main/java/main/controllers/Project/ProjectController.java
@@ -2,15 +2,14 @@
 
 import main.controllers.BaseController;
 import main.controllers.CustomerController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.*;
 import main.model.dto.*;
 
 import java.util.*;
 
-public class ProjectController extends BaseController<ProjectDto> implements IController<ProjectDto> {
+public class ProjectController extends BaseController<ProjectDto> {
     private ProjectDao projectDao;
     private CustomerController customerController;
 
diff --git a/src/main/java/main/controllers/Project/ProjectUserController.java b/src/main/java/main/controllers/Project/ProjectUserController.java
@@ -2,7 +2,6 @@
 
 import main.controllers.BaseController;
 import main.controllers.Administration.UserController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.ProjectUserDao;
@@ -11,7 +10,7 @@
 
 import java.util.List;
 
-public class ProjectUserController extends BaseController<ProjectUserDto> implements IController<ProjectUserDto> {
+public class ProjectUserController extends BaseController<ProjectUserDto> {
     private ProjectUserDao projectUserDao;
     private UserController userController;
 
diff --git a/src/main/java/main/controllers/Project/ResultController.java b/src/main/java/main/controllers/Project/ResultController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.TestDao;
@@ -11,7 +10,7 @@
 
 import java.util.List;
 
-public class ResultController extends BaseController<TestResultDto> implements IController<TestResultDto> {
+public class ResultController extends BaseController<TestResultDto> {
     private TestResultDao testResultDao;
     private TestResultStatDao testResultStatDao;
     private TestDao testDao;
@@ -70,8 +69,8 @@ public boolean delete(TestResultDto template) throws AqualityException {
         }
     }
 
-    public List<TestResultDto> getLatestResultsByMilestone(Integer milestoneId) throws AqualityException {
-        if (baseUser.isFromGlobalManagement() || baseUser.getProjectUserByMilestoneId(milestoneId).isViewer()) {
+    public List<TestResultDto> getLatestResultsByMilestone(Integer projectId, Integer milestoneId) throws AqualityException {
+        if (baseUser.isFromGlobalManagement() || baseUser.getProjectUser(projectId).isViewer()) {
             return fillResults(testResultDao.selectLatestResultsByMilestone(milestoneId));
         } else {
             throw new AqualityPermissionsException("Account is not allowed to view Test Results", baseUser);
diff --git a/src/main/java/main/controllers/Project/ResultResolutionController.java b/src/main/java/main/controllers/Project/ResultResolutionController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.ResultResolutionDao;
@@ -10,7 +9,7 @@
 
 import java.util.List;
 
-public class ResultResolutionController extends BaseController<ResultResolutionDto> implements IController<ResultResolutionDto> {
+public class ResultResolutionController extends BaseController<ResultResolutionDto> {
     private ResultResolutionDao resultResolutionDao;
 
     public ResultResolutionController(UserDto user) {
diff --git a/src/main/java/main/controllers/Project/StepController.java b/src/main/java/main/controllers/Project/StepController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.model.db.dao.project.Step2TestDao;
 import main.model.db.dao.project.StepDao;
@@ -12,7 +11,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public class StepController extends BaseController<StepDto> implements IController<StepDto> {
+public class StepController extends BaseController<StepDto> {
     private StepDao stepDao;
     private Step2TestDao step2TestDao;
 
diff --git a/src/main/java/main/controllers/Project/StepResultController.java b/src/main/java/main/controllers/Project/StepResultController.java
@@ -1,15 +1,14 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.model.db.dao.project.StepResultDao;
 import main.model.dto.StepResultDto;
 import main.model.dto.UserDto;
 
 import java.util.List;
 
-public class StepResultController extends BaseController<StepResultDto> implements IController<StepResultDto> {
+public class StepResultController extends BaseController<StepResultDto> {
     private StepResultDao stepResultDao;
 
     public StepResultController(UserDto user) {
diff --git a/src/main/java/main/controllers/Project/SuiteController.java b/src/main/java/main/controllers/Project/SuiteController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.*;
@@ -10,7 +9,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class SuiteController extends BaseController<TestSuiteDto> implements IController<TestSuiteDto> {
+public class SuiteController extends BaseController<TestSuiteDto> {
     private TestSuiteDao testSuiteDao;
     private TestRunDao testRunDao;
     private Test2SuiteDao test2SuiteDao;
diff --git a/src/main/java/main/controllers/Project/SuiteDashboardController.java b/src/main/java/main/controllers/Project/SuiteDashboardController.java
@@ -1,7 +1,6 @@
 package main.controllers.Project;
 
 import main.controllers.BaseController;
-import main.controllers.IController;
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.Suite2DashboardDao;
@@ -15,7 +14,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class SuiteDashboardController extends BaseController<SuiteDashboardDto> implements IController<SuiteDashboardDto> {
+public class SuiteDashboardController extends BaseController<SuiteDashboardDto> {
     private Suite2DashboardDao suite2DashboardDao;
     private SuiteDashboardDao suiteDashboardDao;
     private SuiteController suiteController;
diff --git a/src/main/java/main/controllers/Project/Test2SuiteController.java b/src/main/java/main/controllers/Project/Test2SuiteController.java
diff --git a/src/main/java/main/controllers/Project/TestController.java b/src/main/java/main/controllers/Project/TestController.java
diff --git a/src/main/java/main/controllers/Project/TestRunController.java b/src/main/java/main/controllers/Project/TestRunController.java
diff --git a/src/main/java/main/model/dto/UserDto.java b/src/main/java/main/model/dto/UserDto.java
diff --git a/src/main/java/main/view/Project/MilestoneServlet.java b/src/main/java/main/view/Project/MilestoneServlet.java
diff --git a/src/main/java/main/view/Project/MilestoneTestResultsServlet.java b/src/main/java/main/view/Project/MilestoneTestResultsServlet.java
