Merge branch 'master' of github.com:SimoV8/ReqV-backend

backend/src/main/java/it/unige/ReqV/projects/tasks/TaskService.java

@@ -45,7 +45,7 @@ public class TaskService {
 
     public ByteArrayOutputStream translate(Long projectId) {
         Project project = projectService.getProjectOfAuthUser(projectId);
-        List<Requirement> reqList = requirementService.getProjectRequirements(project);
+        List<Requirement> reqList = requirementService.getProjectRequirementsEnabled(project);
 
         if(reqList == null || reqList.isEmpty())
             return null;
@@ -59,7 +59,7 @@ public class TaskService {
 
     public Task consistencyChecking(Long projectId) {
         Project project = projectService.getProjectOfAuthUser(projectId);
-        List<Requirement> reqList = requirementService.getProjectRequirements(project);
+        List<Requirement> reqList = requirementService.getProjectRequirementsEnabled(project);
 
         if(reqList == null || reqList.isEmpty())
             return null;
@@ -76,7 +76,7 @@ public class TaskService {
 
     public Task computeMUC(Long projectId) {
         Project project = projectService.getProjectOfAuthUser(projectId);
-        List<Requirement> reqList = requirementService.getProjectRequirements(project);
+        List<Requirement> reqList = requirementService.getProjectRequirementsEnabled(project);
 
         if(reqList == null || reqList.isEmpty())
             return null;

backend/src/main/java/it/unige/ReqV/requirements/RequirementRepository.java

@@ -7,4 +7,7 @@ import java.util.List;
 public interface RequirementRepository extends JpaRepository<Requirement, Long> {
 
     List<Requirement> findByProjectIdOrderById(Long id);
+
+    List<Requirement> findByProjectIdAndDisabledOrderById(Long id, boolean disabled);
+
 }

backend/src/main/java/it/unige/ReqV/requirements/RequirementService.java

@@ -36,6 +36,12 @@ public class RequirementService {
         return requirementRepository.findByProjectIdOrderById(project.getId());
     }
 
+    public List<Requirement> getProjectRequirementsEnabled(Project project) {
+        if(project == null)
+            return null;
+        return requirementRepository.findByProjectIdAndDisabledOrderById(project.getId(), false);
+    }
+
     public Requirement getRequirement(Long id) {
         Requirement requirement = requirementRepository.findOne(id);
         if(isValid(requirement))