Merge pull request #54 from labens-ufrn/feat/create_list_and_details_df

Updates in details of DF

Author: tacianosilva

src/main/java/br/ufrn/dct/apf/controller/DataFunctionController.java

@@ -1,12 +1,12 @@
 package br.ufrn.dct.apf.controller;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.validation.Valid;
-
+import br.ufrn.dct.apf.dto.DataFunctionDTO;
 import br.ufrn.dct.apf.model.DataFunction;
+import br.ufrn.dct.apf.model.Project;
+import br.ufrn.dct.apf.model.User;
+import br.ufrn.dct.apf.model.UserStory;
+import br.ufrn.dct.apf.service.DataFunctionService;
+import br.ufrn.dct.apf.service.ProjectService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +16,11 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
-import br.ufrn.dct.apf.dto.DataFunctionDTO;
-import br.ufrn.dct.apf.model.Project;
-import br.ufrn.dct.apf.model.User;
-import br.ufrn.dct.apf.model.UserStory;
-import br.ufrn.dct.apf.service.DataFunctionService;
-import br.ufrn.dct.apf.service.ProjectService;
+
+import javax.validation.Valid;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Controller
 public class DataFunctionController extends AbstractController {
@@ -78,15 +77,21 @@ public ModelAndView add(DataFunctionDTO df) {
         return mv;
     }
 
-//    @GetMapping("/df/list")
-//    public ModelAndView list() {
+//    @GetMapping("/df/list/{projectId}")
+//    public ModelAndView list(@PathVariable("projectId") Long projectId) throws BusinessRuleException {
 //        ModelAndView mv = new ModelAndView("df/list");
 //
-//        User current = getCurrentUser();
+//        User currentUser = getCurrentUser();
+//        Project project = projectService.findOne(projectId);
+//
+//        if (!project.isMemberOfProject(currentUser)) {
+//            throw MEMBER_NOT_EXISTS;
+//        }
 //
-//        List<Project> projects = projectService.findByUserId(current.getId());
+//        List<DataFunction> dfs = dataFunctionService.findByProject(projectId);
 //
-//        mv.addObject("projects", projects);
+//        mv.addObject("project", project);
+//        mv.addObject("dfs", dfs);
 //
 //        return mv;
 //    }
@@ -126,17 +131,4 @@ public ModelAndView details(@PathVariable("dataFunctionId") Long id) {
 
         return mv;
     }
-
-    // Consultar se precisa ser por projeto ou time a busca
-    @GetMapping("/df/list")
-    public ModelAndView list() {
-        ModelAndView mv = new ModelAndView("df/list");
-
-        List<DataFunction> dfs = dataFunctionService.findAll();
-
-        mv.addObject("dfs", dfs);
-
-        return mv;
-    }
-
 }

src/main/java/br/ufrn/dct/apf/repository/DataFunctionRepository.java

@@ -1,11 +1,13 @@
 package br.ufrn.dct.apf.repository;
 
+import br.ufrn.dct.apf.model.DataFunction;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import br.ufrn.dct.apf.model.DataFunction;
+import java.util.List;
 
 @Repository("dataFunctionRepository")
 public interface DataFunctionRepository extends JpaRepository<DataFunction, Long> {
 
+    List<DataFunction> findByProject(Long projectId);
 }

src/main/java/br/ufrn/dct/apf/service/DataFunctionService.java

@@ -64,4 +64,8 @@ private DataFunctionDTO createDTO(DataFunction df) {
     public void delete(Long id) {
         dataFunctionRepository.deleteById(id);
     }
+
+    public List<DataFunction> findByProject(Long projectId) {
+        return dataFunctionRepository.findByProject(projectId);
+    }
 }

src/main/resources/templates/df/list.html

@@ -83,6 +83,7 @@
                     </td>
                     <td>
                       <div class="btn-group pull-right">
+                        <a class="btn btn-sm btn-primary" th:href="@{/df/details/{id}(id=${dataFunction.id})}">Detalhes</a>
                         <a class="btn btn-sm btn-primary" th:href="@{/df/edit/{id}(id=${dataFunction.id})}">Editar</a>
                         <a class="delete btn btn-sm btn-danger" th:href="@{/df/delete/{id}(id=${dataFunction.id})}">Excluir</a>
                       </div>
@@ -121,8 +122,7 @@
                     <td>
                       <div class="btn-group pull-right">
                         <a class="btn btn-sm btn-primary" th:href="@{/us/edit/{id}(id=${userstory.id})}">Editar</a>
-                        <a class="delete btn btn-sm btn-danger"
-                           th:href="@{/us/delete/{id}(id=${userstory.id})}">Excluir</a>
+                        <a class="delete btn btn-sm btn-danger" th:href="@{/us/delete/{id}(id=${userstory.id})}">Excluir</a>
                       </div>
                     </td>
                   </tr>
@@ -179,5 +179,10 @@
     <div th:include="fragments/footer :: footer-authenticated" align="center"></div>
   </div>
 </div>
+<script type="text/javascript">
+  function viewDetailsDf(id) {
+    window.location = `details/${id}`;
+  }
+</script>
 </body>
 </html>