diff --git a/src/main/java/com/olympus/hermione/models/Scenario.java b/src/main/java/com/olympus/hermione/models/Scenario.java index 7a3862f..22c997f 100644 --- a/src/main/java/com/olympus/hermione/models/Scenario.java +++ b/src/main/java/com/olympus/hermione/models/Scenario.java @@ -25,6 +25,7 @@ public class Scenario { private List steps; private List inputs; private String modelId; + private String visible; @DocumentReference diff --git a/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java b/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java index 9e14813..b3e8a4b 100644 --- a/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java +++ b/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java @@ -18,11 +18,13 @@ public interface ScenarioRepository extends MongoRepository { /* @Query("{ 'usable_for': ?0 }") List findByUsableFor(String projectId);*/ - List findByAvailableForProjects_Id(String projectId); + //List findByAvailableForProjects_Id(String projectId); + List findByAvailableForProjects_IdAndVisible(String projectId, String visible); - List findByAvailableForApplications_Id(String projectId); - List findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull(); + List findByAvailableForApplications_IdAndVisible(String projectId, String visible); + + List findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNullAndVisible(String visible); } diff --git a/src/main/java/com/olympus/hermione/security/config/CorsConfig.java b/src/main/java/com/olympus/hermione/security/config/CorsConfig.java index 7cd015e..0553354 100644 --- a/src/main/java/com/olympus/hermione/security/config/CorsConfig.java +++ b/src/main/java/com/olympus/hermione/security/config/CorsConfig.java @@ -15,6 +15,7 @@ public class CorsConfig implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedOrigins(hermione_frontend_url) + .allowedOriginPatterns("**") .allowedHeaders("*") .allowedMethods("GET", "POST", "PUT", "DELETE","OPTIONS"); } diff --git a/src/main/java/com/olympus/hermione/services/ScenarioService.java b/src/main/java/com/olympus/hermione/services/ScenarioService.java index 3617d67..6104100 100644 --- a/src/main/java/com/olympus/hermione/services/ScenarioService.java +++ b/src/main/java/com/olympus/hermione/services/ScenarioService.java @@ -27,7 +27,7 @@ public class ScenarioService { logger.info("getListProjectByUser function:"); List lstScenarios = null; try{ - lstScenarios = scenarioRepo.findByAvailableForProjects_Id(project); + lstScenarios = scenarioRepo.findByAvailableForProjects_IdAndVisible(project, "Y"); }catch(Exception e){ logger.error("Exception ScenarioRepository:", e.getMessage()); } @@ -41,7 +41,7 @@ public class ScenarioService { logger.info("getListProjectByUser function:"); List lstScenarios = null; try{ - lstScenarios = scenarioRepo.findByAvailableForApplications_Id(app); + lstScenarios = scenarioRepo.findByAvailableForApplications_IdAndVisible(app, "Y"); }catch(Exception e){ logger.error("Exception ScenarioRepository:", e.getMessage()); } @@ -55,7 +55,7 @@ public class ScenarioService { logger.info("getListProjectByUser function:"); List lstScenarios = null; try{ - lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull(); + lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNullAndVisible("Y"); }catch(Exception e){ logger.error("Exception ScenarioRepository:", e.getMessage()); }