admin/hermione
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add visible filter

Browse Source
This commit is contained in:
Florinda
2024-10-24 14:20:19 +02:00
parent 2b8b159c99
commit d8c1b276dc
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/olympus/hermione/models/Scenario.java
View File

@@ -25,6 +25,7 @@ public class Scenario {
private List<ScenarioStep> steps; private List<ScenarioStep> steps;
private List<ScenarioInputs> inputs; private List<ScenarioInputs> inputs;
private String modelId; private String modelId;
private String visible;
@DocumentReference @DocumentReference

8
src/main/java/com/olympus/hermione/repository/ScenarioRepository.java
View File

@@ -18,11 +18,13 @@ public interface ScenarioRepository extends MongoRepository<Scenario, String> {
/* @Query("{ 'usable_for': ?0 }") /* @Query("{ 'usable_for': ?0 }")
List<Scenario> findByUsableFor(String projectId);*/ List<Scenario> findByUsableFor(String projectId);*/
List<Scenario> findByAvailableForProjects_Id(String projectId); //List<Scenario> findByAvailableForProjects_Id(String projectId);
List<Scenario> findByAvailableForProjects_IdAndVisible(String projectId, String visible);
List<Scenario> findByAvailableForApplications_Id(String projectId);
List<Scenario> findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull(); List<Scenario> findByAvailableForApplications_IdAndVisible(String projectId, String visible);
List<Scenario> findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNullAndVisible(String visible);
} }

6
src/main/java/com/olympus/hermione/services/ScenarioService.java
View File

@@ -27,7 +27,7 @@ public class ScenarioService {
logger.info("getListProjectByUser function:"); logger.info("getListProjectByUser function:");
List<Scenario> lstScenarios = null; List<Scenario> lstScenarios = null;
try{ try{
lstScenarios = scenarioRepo.findByAvailableForProjects_Id(project); lstScenarios = scenarioRepo.findByAvailableForProjects_IdAndVisible(project, "Y");
}catch(Exception e){ }catch(Exception e){
logger.error("Exception ScenarioRepository:", e.getMessage()); logger.error("Exception ScenarioRepository:", e.getMessage());
} }
@@ -41,7 +41,7 @@ public class ScenarioService {
logger.info("getListProjectByUser function:"); logger.info("getListProjectByUser function:");
List<Scenario> lstScenarios = null; List<Scenario> lstScenarios = null;
try{ try{
lstScenarios = scenarioRepo.findByAvailableForApplications_Id(app); lstScenarios = scenarioRepo.findByAvailableForApplications_IdAndVisible(app, "Y");
}catch(Exception e){ }catch(Exception e){
logger.error("Exception ScenarioRepository:", e.getMessage()); logger.error("Exception ScenarioRepository:", e.getMessage());
} }
@@ -55,7 +55,7 @@ public class ScenarioService {
logger.info("getListProjectByUser function:"); logger.info("getListProjectByUser function:");
List<Scenario> lstScenarios = null; List<Scenario> lstScenarios = null;
try{ try{
lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull(); lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNullAndVisible("Y");
}catch(Exception e){ }catch(Exception e){
logger.error("Exception ScenarioRepository:", e.getMessage()); logger.error("Exception ScenarioRepository:", e.getMessage());
} }