Fill issue with entities

Author: VladislavKostyukevich

src/main/java/main/controllers/Project/IssueController.java

@@ -5,25 +5,33 @@
 import main.exceptions.AqualityPermissionsException;
 import main.model.db.dao.project.IssueDao;
 import main.model.db.dao.project.IssueStatusDao;
+import main.model.db.dao.project.UserDao;
 import main.model.dto.project.IssueDto;
 import main.model.dto.project.IssueStatusDto;
+import main.model.dto.project.ResultResolutionDto;
 import main.model.dto.settings.UserDto;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class IssueController extends BaseController<IssueDto> {
     private IssueDao issueDao;
     private IssueStatusDao issueStatusDao;
+    private UserDao userDao;
+    private ResultResolutionController resultResolutionController;
 
     public IssueController(UserDto user) {
         super(user);
         issueDao = new IssueDao();
         issueStatusDao = new IssueStatusDao();
+        userDao = new UserDao();
+        resultResolutionController = new ResultResolutionController(user);
     }
     @Override
     public List<IssueDto> get(IssueDto entity) throws AqualityException {
         if (baseUser.isManager() || baseUser.getProjectUser(entity.getProject_id()).isViewer()) {
-            return issueDao.searchAll(entity);
+            return fillIssues(issueDao.searchAll(entity));
         } else {
             throw new AqualityPermissionsException("Account is not allowed to view Issues", baseUser);
         }
@@ -44,6 +52,36 @@ public boolean delete(IssueDto entity) throws AqualityException {
     }
 
     public List<IssueStatusDto> get(IssueStatusDto status) throws AqualityException {
-        return  issueStatusDao.searchAll(status);
+        return issueStatusDao.searchAll(status);
+    }
+
+    private List<IssueDto> fillIssues(List<IssueDto> issues) throws AqualityException {
+        if(issues.isEmpty()) {
+            return issues;
+        }
+
+        List<UserDto> users = userDao.getAll();
+        List<IssueStatusDto> issueStatuses = get(new IssueStatusDto());
+        List<IssueDto> filledIssues = new ArrayList<>();
+
+        ResultResolutionDto resultResolution = new ResultResolutionDto();
+        resultResolution.setProject_id(issues.get(0).getProject_id());
+        List<ResultResolutionDto> resultResolutions = resultResolutionController.get(resultResolution);
+
+        for (IssueDto issue : issues) {
+            UserDto assignee = users.stream().filter(x -> x.getId().equals(issue.getAssignee_id())).findFirst().orElse(null);
+            UserDto creator = users.stream().filter(x -> x.getId().equals(issue.getCreator_id())).findFirst().orElse(null);
+            if(assignee != null) {
+                issue.setAssignee(assignee.toPublic());
+            }
+            if(creator != null) {
+                issue.setCreator(creator.toPublic());
+            }
+            issue.setStatus(issueStatuses.stream().filter(x -> x.getId().equals(issue.getStatus_id())).findFirst().orElse(null));
+            issue.setResolution(resultResolutions.stream().filter(x -> x.getId().equals(issue.getResolution_id())).findFirst().orElse(null));
+            filledIssues.add(issue);
+        }
+
+        return filledIssues;
     }
 }

src/main/java/main/model/dto/project/IssueDto.java

@@ -6,6 +6,7 @@
 import main.annotations.DataBaseName;
 import main.annotations.DataBaseSearchable;
 import main.model.dto.BaseDto;
+import main.model.dto.settings.UserDto;
 import main.utils.CustomerDateAndTimeDeserialize;
 
 import java.util.Date;
@@ -20,6 +21,7 @@ public class IssueDto extends BaseDto {
     @DataBaseInsert
     @DataBaseSearchable
     private Integer resolution_id;
+    private ResultResolutionDto resolution;
     @DataBaseName(name="request_title")
     @DataBaseInsert
     private String title;
@@ -33,13 +35,15 @@ public class IssueDto extends BaseDto {
     @DataBaseInsert
     @DataBaseSearchable
     private Integer assignee_id;
+    private UserDto assignee;
     @DataBaseName(name="request_expression")
     @DataBaseInsert
     private String expression;
     @DataBaseName(name="request_status_id")
     @DataBaseInsert
     @DataBaseSearchable
     private Integer status_id;
+    private IssueStatusDto status;
     @DataBaseName(name="request_label_id")
     @DataBaseInsert
     @DataBaseSearchable
@@ -51,6 +55,7 @@ public class IssueDto extends BaseDto {
     @DataBaseName(name="request_creator_id")
     @DataBaseInsert
     private Integer creator_id;
+    private UserDto creator;
     @JsonDeserialize(using= CustomerDateAndTimeDeserialize.class)
     private Date created;
     @DataBaseName(name="request_limit")