Merge pull request #63 from aquality-automation/feature/issue

Feature/issue

Author: VladislavKostyukevich

pom.xml

@@ -6,7 +6,7 @@
     <groupId>unifi_reporting_api</groupId>
     <artifactId>api</artifactId>
     <packaging>war</packaging>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/main/Session.java

@@ -9,7 +9,10 @@
 import main.model.db.dao.project.UserDao;
 import main.model.db.imports.Importer;
 import main.model.db.imports.TestNameNodeType;
-import main.model.dto.*;
+import main.model.dto.project.APITokenDto;
+import main.model.dto.project.ProjectUserDto;
+import main.model.dto.project.TestRunDto;
+import main.model.dto.settings.UserDto;
 import main.model.email.TestRunEmails;
 
 import javax.naming.AuthenticationException;

src/main/java/main/controllers/Administration/AdministrationController.java

@@ -1,7 +1,7 @@
 package main.controllers.Administration;
 
 import main.exceptions.AqualityException;
-import main.model.dto.UserDto;
+import main.model.dto.settings.UserDto;
 
 public class AdministrationController {
     private UserController userController;

src/main/java/main/controllers/Administration/AppSettingsController.java

@@ -5,9 +5,9 @@
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.settings.AppSettingsDao;
 import main.model.db.dao.settings.LdapDao;
-import main.model.dto.AppSettingsDto;
-import main.model.dto.LdapDto;
-import main.model.dto.UserDto;
+import main.model.dto.settings.AppSettingsDto;
+import main.model.dto.settings.LdapDto;
+import main.model.dto.settings.UserDto;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.StringUtils;
 import org.apache.poi.util.NotImplemented;

src/main/java/main/controllers/Administration/EmailSettingsController.java

@@ -3,8 +3,8 @@
 import main.controllers.BaseController;
 import main.exceptions.AqualityException;
 import main.model.db.dao.settings.EmailSettingsDao;
-import main.model.dto.EmailSettingsDto;
-import main.model.dto.UserDto;
+import main.model.dto.settings.EmailSettingsDto;
+import main.model.dto.settings.UserDto;
 import org.apache.poi.util.NotImplemented;
 
 import java.util.List;

src/main/java/main/controllers/Administration/StepTypeController.java

@@ -3,8 +3,8 @@
 import main.controllers.BaseController;
 import main.exceptions.AqualityException;
 import main.model.db.dao.project.StepTypeDao;
-import main.model.dto.StepTypeDto;
-import main.model.dto.UserDto;
+import main.model.dto.project.StepTypeDto;
+import main.model.dto.settings.UserDto;
 
 import java.util.List;
 

src/main/java/main/controllers/Administration/UserController.java

@@ -7,8 +7,8 @@
 import main.model.db.dao.project.PasswordDao;
 import main.model.db.dao.project.UserDao;
 import main.model.db.dao.project.UserSessionDao;
-import main.model.dto.PasswordDto;
-import main.model.dto.UserDto;
+import main.model.dto.settings.PasswordDto;
+import main.model.dto.settings.UserDto;
 import main.model.dto.UserSessionDto;
 import main.utils.DateUtils;
 import main.utils.LDAP.LDAPAuthenticator;

src/main/java/main/controllers/AuditController.java

@@ -7,7 +7,9 @@
 import main.model.db.dao.audit.*;
 import main.model.db.dao.project.ProjectDao;
 import main.model.db.dao.project.UserDao;
-import main.model.dto.*;
+import main.model.dto.audit.*;
+import main.model.dto.project.ProjectDto;
+import main.model.dto.settings.UserDto;
 import main.utils.ExcelUtils;
 import main.utils.FileUtils;
 import org.json.JSONArray;

src/main/java/main/controllers/BaseController.java

@@ -1,7 +1,7 @@
 package main.controllers;
 
 import main.model.dto.BaseDto;
-import main.model.dto.UserDto;
+import main.model.dto.settings.UserDto;
 
 public abstract class BaseController<T extends BaseDto> implements IController<T>{
     protected UserDto baseUser;

src/main/java/main/controllers/ControllerFactory.java

@@ -4,7 +4,9 @@
 import main.controllers.Administration.StepTypeController;
 import main.controllers.Administration.UserController;
 import main.controllers.Project.*;
-import main.model.dto.*;
+import main.model.dto.project.*;
+import main.model.dto.settings.EmailSettingsDto;
+import main.model.dto.settings.UserDto;
 
 public class ControllerFactory {
     private UserDto user;
@@ -73,4 +75,7 @@ public StepTypeController getHandler(StepTypeDto entity) {
     public PredefinedResolutionController getHandler(PredefinedResolutionDto entity) {
         return new PredefinedResolutionController(user);
     }
+    public IssueController getHandler(IssueDto entity) {
+        return new IssueController(user);
+    }
 }