Remove Redundant Customer features

Author: VladislavKostyukevich

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

@@ -76,7 +76,7 @@ public UserDto updatePassword(PasswordDto password) throws AqualityException {
         return userDao.create(user);
     }
 
-    public UserDto auth(String authString, boolean ldap) throws AqualityException {
+    UserDto auth(String authString, boolean ldap) throws AqualityException {
         Base64 base64= new Base64();
         String authStringDecoded = StringUtils.newStringUtf8(base64.decode(authString));
         String[] authStringSplit = authStringDecoded.split(":");

src/main/java/main/controllers/CustomerController.java

@@ -2,34 +2,21 @@
 
 import main.exceptions.AqualityException;
 import main.exceptions.AqualityPermissionsException;
-import main.model.db.dao.customer.CustomerAttachmentsDao;
-import main.model.db.dao.customer.CustomerCommentsDao;
 import main.model.db.dao.customer.CustomerDao;
-import main.model.db.dao.customer.CustomerMembersDao;
 import main.model.db.dao.project.ProjectDao;
-import main.model.db.dao.project.ProjectUserDao;
 import main.model.db.dao.project.UserDao;
 import main.model.dto.*;
-import main.utils.FileUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class CustomerController extends BaseController<CustomerDto> {
     private CustomerDao customerDao;
-    private CustomerAttachmentsDao customerAttachmentsDao;
-    private CustomerCommentsDao customerCommentsDao;
-    private CustomerMembersDao customerMembersDao;
     private UserDao userDao;
-    private ProjectUserDao projectUserDao;
 
     public CustomerController(UserDto user) {
         super(user);
         customerDao = new CustomerDao();
-        customerAttachmentsDao = new CustomerAttachmentsDao();
-        customerCommentsDao = new CustomerCommentsDao();
-        customerMembersDao = new CustomerMembersDao();
-        projectUserDao = new ProjectUserDao();
         userDao = new UserDao();
     }
 
@@ -47,68 +34,14 @@ public List<CustomerDto> get(CustomerDto template, boolean withChildren) throws
         }
     }
 
-    public List<CustomerMemberDto> get(CustomerMemberDto template) throws AqualityException {
-        if(baseUser.isCoordinator()){
-            return customerMembersDao.searchAll(template);
-        }else{
-            throw new AqualityPermissionsException("Account is not allowed to view Customer Members", baseUser);
-        }
-    }
-
-    public List<CustomerCommentDto> get(CustomerCommentDto template) throws AqualityException {
-        if(baseUser.isCoordinator()){
-            return completeComments(customerCommentsDao.searchAll(template));
-        }else{
-            throw new AqualityPermissionsException("Account is not allowed to view Customer Comments", baseUser);
-        }
-    }
-
-    public List<CustomerAttachmentDto> get(CustomerAttachmentDto template) throws AqualityException {
-        if(baseUser.isCoordinator()){
-            return customerAttachmentsDao.searchAll(template);
-        }else{
-            throw new AqualityPermissionsException("Account is not allowed to view Customer Comments", baseUser);
-        }
-    }
-
     @Override
     public CustomerDto create(CustomerDto template) throws AqualityException {
         if(baseUser.isCoordinator()){
-            if(template.getId() != null && template.getAccounting() == 0){
-                template.setAccount_manager(new UserDto());
-                template.getAccount_manager().setId(0);
-                // TODO: Remove Customer Members
-            }
-
-            CustomerDto customer = fillCustomer(customerDao.create(template));
-
-            if(template.getAccounting() != null && template.getAccounting() == 1 && template.getAccount_manager() != null){
-                addPermissions(template.getAccount_manager().getId(), customer);
-            }
-            return customer;
+            return fillCustomer(customerDao.create(template));
         }else{
             throw new AqualityPermissionsException("Account is not allowed to create Customers", baseUser);
         }
     }
-    public CustomerAttachmentDto create(CustomerAttachmentDto template) throws AqualityException {
-        if(baseUser.isCoordinator()){
-            return customerAttachmentsDao.create(template);
-        }else{
-            throw new AqualityPermissionsException("Account is not allowed to create Customer Attachment", baseUser);
-        }
-    }
-    public CustomerCommentDto create(CustomerCommentDto template) throws AqualityException {
-        if(baseUser.isCoordinator()){
-            return customerCommentsDao.create(template);
-        }else{
-            throw new AqualityPermissionsException("Account is not allowed to create Customer Comment", baseUser);
-        }
-    }
-
-    // TODO: update members
-    public  void updateCustomerMember(List<CustomerMemberDto> members){
-        throw new UnsupportedOperationException("Not implemented Update Members function");
-    }
 
     @Override
     public boolean delete(CustomerDto template) throws AqualityException {
@@ -118,36 +51,13 @@ public boolean delete(CustomerDto template) throws AqualityException {
             throw new AqualityPermissionsException("Account is not allowed to delete Customers", baseUser);
         }
     }
-    public boolean delete(CustomerAttachmentDto template) throws AqualityException {
-        if(baseUser.isCoordinator()){
-            FileUtils fileUtils = new FileUtils();
-            template = get(template).get(0);
-            List<String> pathes = new ArrayList<>();
-            pathes.add(template.getPath());
-            fileUtils.removeFiles(pathes);
-            return customerAttachmentsDao.delete(template);
-        }else{
-            throw new AqualityPermissionsException("Account is not allowed to view Customers", baseUser);
-        }
-    }
 
     private List<CustomerDto> fillCustomers(List<CustomerDto> customers) throws AqualityException {
         List<UserDto> users = userDao.getAll();
-
         for (CustomerDto customer: customers){
             customer.setCoordinator(users.stream().filter(x -> x.getId().equals(customer.getCoordinator_id())).findFirst().orElse(null));
             customer.getCoordinator().toPublic();
-
-            if(customer.getAccounting() == 1){
-                Integer accountManagerId = customer.getAccount_manager_id();
-                customer.setAccount_manager(users.stream().filter(x->x.getId().equals(accountManagerId)).findFirst().orElse(null));
-                customer.getAccount_manager().toPublic();
-            }
-
             if(baseUser.isCoordinator()){
-                customer.setAccount_team(getMembers(customer));
-                customer.setComments(getComments(customer));
-                customer.setAttachments(getAttachments(customer));
                 customer.setProjects(getProjects(customer));
             }
         }
@@ -162,60 +72,9 @@ private List<ProjectDto> getProjects(CustomerDto customer) throws AqualityExcept
         return projectDao.searchAll(projectTemplate);
     }
 
-    private List<CustomerAttachmentDto> getAttachments(CustomerDto customer) throws AqualityException {
-        CustomerAttachmentDto customerAttachmentDtoTemplate = new CustomerAttachmentDto();
-        customerAttachmentDtoTemplate.setCustomer_id(customer.getId());
-        return get(customerAttachmentDtoTemplate);
-    }
-
-    private List<CustomerCommentDto> getComments(CustomerDto customer) throws AqualityException {
-        CustomerCommentDto customerCommentDtoTemplate = new CustomerCommentDto();
-        customerCommentDtoTemplate.setCustomer_id(customer.getId());
-        return get(customerCommentDtoTemplate);
-    }
-
-    private List<CustomerMemberDto> getMembers(CustomerDto customer) throws AqualityException {
-        CustomerMemberDto customerMemberDto = new CustomerMemberDto();
-        customerMemberDto.setCustomer_id(customer.getId());
-        return get(customerMemberDto);
-    }
-
     private CustomerDto fillCustomer(CustomerDto customer) throws AqualityException {
         List<CustomerDto> customers = new ArrayList<>();
         customers.add(customer);
         return fillCustomers(customers).get(0);
     }
-
-    private void addPermissions(Integer user_id, CustomerDto customerDto) throws AqualityException {
-        List<ProjectDto> projects = customerDto.getProjects();
-
-        for (ProjectDto project : projects) {
-            ProjectUserDto projectUserDto = new ProjectUserDto();
-            UserDto userDto = new UserDto();
-            userDto.setId(user_id);
-            projectUserDto.setProject_id(project.getId());
-            projectUserDto.setUser(userDto);
-            projectUserDto.setViewer(1);
-            projectUserDao.create(projectUserDto);
-        }
-    }
-
-    private List<CustomerCommentDto> completeComments(List<CustomerCommentDto> comments) throws AqualityException {
-        UserDto userTemplate = new UserDto();
-
-        for (CustomerCommentDto comment: comments){
-
-            if(comment.getUser_id() != null){
-                userTemplate.setId(comment.getUser_id());
-            }else{
-                userTemplate.setId(1);
-            }
-            try{
-                comment.setAuthor(userDao.getEntityById(userTemplate));
-            } catch (Exception e){
-                throw new AqualityException("Cannot find author for Customer Comment");
-            }
-        }
-        return comments;
-    }
 }

src/main/java/main/controllers/Project/ProjectController.java

@@ -23,7 +23,6 @@ public ProjectController(UserDto user) {
     public ProjectDto create(ProjectDto template) throws AqualityException {
         if(baseUser.isAdmin() || allowUpdateProject(template)){
             ProjectDto project = projectDao.create(template);
-            updateProjectPermissions(project);
             return project;
         }else{
             throw new AqualityPermissionsException("Account is not allowed to create Projects", baseUser);
@@ -54,7 +53,7 @@ public boolean delete(ProjectDto template) throws AqualityException {
         }
     }
 
-    public boolean isStepsEnabled(Integer projectId) throws AqualityException {
+    boolean isStepsEnabled(Integer projectId) throws AqualityException {
         ProjectDto project = new ProjectDto();
         project.setId(projectId);
         List<ProjectDto> projects = get(project, false);
@@ -66,12 +65,6 @@ public boolean isStepsEnabled(Integer projectId) throws AqualityException {
         return projects.get(0).getSteps() == 1;
     }
 
-    private void updateProjectPermissions(ProjectDto entity) throws AqualityException {
-        if(entity.getCustomer() != null && entity.getCustomer().getAccounting() == 1 && entity.getId() != 0){
-            updatePermissions(entity.getCustomer().getId(), entity.getId());
-        }
-    }
-
     private boolean allowUpdateProject(ProjectDto template) {
         if(template.getId() != null) {
             ProjectUserDto projectUser = baseUser.getProjectUser(template.getId());
@@ -80,18 +73,15 @@ private boolean allowUpdateProject(ProjectDto template) {
         return false;
     }
 
-    //TODO create
-    private void updatePermissions(Integer customer_id, Integer project_id) throws AqualityException {
-    }
-
-    //TODO Refactoring
     private List<ProjectDto> fillCustomers(List<ProjectDto> projects, boolean withChildren) throws AqualityException {
         List<ProjectDto> filledProjects = new ArrayList<>();
         CustomerDto customerTemplate = new CustomerDto();
         if(projects.size() == 1) {
             customerTemplate.setId(projects.get(0).getCustomer_id());
         }
+
         List<CustomerDto> customerDtoList = customerController.get(new CustomerDto(), withChildren);
+
         for (ProjectDto filledProject : projects) {
             if (filledProject.getCustomer_id() != null) {
                 int customerId = filledProject.getCustomer_id();

src/main/java/main/model/db/dao/customer/CustomerAttachmentsDao.java

@@ -9,6 +9,6 @@ public CustomerDao() {
         super(CustomerDto.class);
         select = "{call SELECT_CUSTOMER(?)}";
         remove = "{call REMOVE_CUSTOMER(?)}";
-        insert = "{call INSERT_CUSTOMER(?,?,?,?,?)}";
+        insert = "{call INSERT_CUSTOMER(?,?,?)}";
     }
 }

src/main/java/main/model/db/dao/customer/CustomerCommentsDao.java

@@ -19,8 +19,8 @@
 public class UserDao extends DAO<UserDto> {
     public UserDao() {
         super(UserDto.class);
-        select = "{call SELECT_USERS(?,?,?,?,?,?,?)}";
-        insert = "{call INSERT_USER(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+        select = "{call SELECT_USERS(?,?,?,?,?,?)}";
+        insert = "{call INSERT_USER(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
         remove = "{call REMOVE_USER(?)}";
     }