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

Merge commit 'ab9b0561352743fbf058a8309e500e9cfd16ce3a'

Browse Source
This commit is contained in:
andrea.terzani
2024-10-25 17:53:45 +02:00
parent b04cd2c5ff ab9b056135
commit 00a06300b9
4 changed files with 10 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);
} }

1
src/main/java/com/olympus/hermione/security/config/CorsConfig.java
View File

@@ -15,6 +15,7 @@ public class CorsConfig implements WebMvcConfigurer {
public void addCorsMappings(CorsRegistry registry) { public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**") registry.addMapping("/**")
.allowedOrigins(hermione_frontend_url) .allowedOrigins(hermione_frontend_url)
.allowedOriginPatterns("**")
.allowedHeaders("*") .allowedHeaders("*")
.allowedMethods("GET", "POST", "PUT", "DELETE","OPTIONS"); .allowedMethods("GET", "POST", "PUT", "DELETE","OPTIONS");
} }

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());
} }