Revize 66ee7533

https://kivprogrammers.atlassian.net/browse/TSP2-28 integrace kontroleru pro hierarchie projektů

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/controller/management/ProjectController.java

@@ -4 +4 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.ProjectService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.types.Node;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.ProjectDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.converters.ProjectToDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21 +23 @@
 /**
  * This class contains all endpoints of projects.html
  */
-@Controller
+//@Controller
 public class ProjectController {
 
     private final Logger LOGGER = LoggerFactory.getLogger(ProjectController.class);
@@ -36 +38 @@
      */
     @GetMapping("/management/projects")
     public String projects(Model model) {
+        ProjectToDto projectToDto = new ProjectToDto();
         List<Node> parents = new ArrayList<>();
-        List<Project> parentProjects = projectService.getParentProjects();
-        for(Project parentProject : parentProjects) {
+        List<ProjectDto> parentProjects = projectToDto.convert(projectService.getParentProjects());
+        for(ProjectDto parentProject : parentProjects) {
             Node n = new Node();
             n.project = parentProject;
             n.children = new ArrayList<>();
@@ -46 +49 @@
         }
 
         for(Node n : parents) {
-            n.children = calculate(n.project);
+            n.children = projectService.calculate(n.project);
         }
 
         model.addAttribute("parents", parents);
@@ -146 +149 @@
      * @param p Project for which the hierarchy will be generated
      * @return  List of project's children with their hierarchy
      */
-    private ArrayList<Node> calculate(Project p) {
+    private ArrayList<Node> calculate(ProjectDto p) {
+        ProjectToDto projectToDto = new ProjectToDto();
         ArrayList<Node> nodes = new ArrayList<>();
-        List<Project> projects = projectService.getSubordinateProjectsTo(p.getId());
-        for(Project project : projects) {
+        List<ProjectDto> projects = projectToDto.convert(projectService.getSubordinateProjectsTo(p.getId()));
+        for(ProjectDto project : projects) {
             Node n = new Node();
             n.project = project;
             n.children = calculate(project);

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/model/management/types/Node.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.model.management.types;
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.ProjectDto;
 
 import java.util.ArrayList;
 
 public class Node {
-    public Project project;
+    public ProjectDto project;
     public ArrayList<Node> children;
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/ProjectService.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service;
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.types.Node;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.ProjectDto;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public interface ProjectService {
@@ -46 +49 @@
      * @return      List of subordinate projects
      */
     List<Project> getSubordinateProjectsTo(Long id);
+
+    /**
+     * Method creating the hierarchy of projects by recursion
+     * @param p Project for which the hierarchy will be generated
+     * @return  List of project's children with their hierarchy
+     */
+    ArrayList<Node> calculate(ProjectDto p);
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/ProjectServiceImpl.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service;
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.types.Node;
 import cz.zcu.fav.kiv.antipatterndetectionapp.repository.ProjectRepository;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.ProjectDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.converters.ProjectToDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58 +61 @@
     public List<Project> getSubordinateProjectsTo(Long id) {
         return projectRepository.getSubordinateProjectsTo(id);
     }
+
+    @Override
+    public ArrayList<Node> calculate(ProjectDto p) {
+        ProjectToDto projectToDto = new ProjectToDto();
+        ArrayList<Node> nodes = new ArrayList<>();
+        List<ProjectDto> projects = projectToDto.convert(getSubordinateProjectsTo(p.getId()));
+        for(ProjectDto project : projects) {
+            Node n = new Node();
+            n.project = project;
+            n.children = calculate(project);
+            nodes.add(n);
+        }
+        return nodes;
+    }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/management/ProjectController.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.v2.controller.management;
+
+import com.google.gson.Gson;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.types.Node;
+import cz.zcu.fav.kiv.antipatterndetectionapp.service.ProjectService;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.ProjectDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.converters.ProjectToDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * This class contains all endpoints of projects.html
+ */
+@Controller
+@RequestMapping("v2/management")
+public class ProjectController {
+
+    @Autowired
+    private ProjectService projectService;
+
+    @GetMapping("/projects")
+    public ResponseEntity<String> getProjectsData() {
+        ProjectToDto projectToDto = new ProjectToDto();
+        List<Node> parents = new ArrayList<>();
+        List<ProjectDto> parentProjects = projectToDto.convert(projectService.getParentProjects());
+        for(ProjectDto parentProject : parentProjects) {
+            Node n = new Node();
+            n.project = parentProject;
+            n.children = new ArrayList<>();
+            parents.add(n);
+        }
+
+        for(Node n : parents) {
+            n.children = projectService.calculate(n.project);
+        }
+
+        return ResponseEntity.status(parents.size() > 0 ? HttpStatus.OK : HttpStatus.NO_CONTENT).body(new Gson().toJson(parents));
+    }
+
+}
+