From 2b8b159c99a785de62b39bce27eff24ae8cada64 Mon Sep 17 00:00:00 2001
From: "emanuele.ferrelli" <emanuele.ferrelli@accenture.com>
Date: Thu, 24 Oct 2024 08:44:15 +0000
Subject: [PATCH 1/3] add Scenario outputType

---
 src/main/java/com/olympus/hermione/models/Scenario.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/olympus/hermione/models/Scenario.java b/src/main/java/com/olympus/hermione/models/Scenario.java
index 18efdbe..ad65ac5 100644
--- a/src/main/java/com/olympus/hermione/models/Scenario.java
+++ b/src/main/java/com/olympus/hermione/models/Scenario.java
@@ -33,4 +33,6 @@ public class Scenario {
     private List<Project> availableForApplications;
     
     private boolean useChatMemory=false;
+    private String outputType;
+
 }

From d8c1b276dc01128063f67176c695e5cc4b6c909d Mon Sep 17 00:00:00 2001
From: Florinda <dalia.florinda@accenture.com>
Date: Thu, 24 Oct 2024 14:20:19 +0200
Subject: [PATCH 2/3] add visible filter

---
 src/main/java/com/olympus/hermione/models/Scenario.java   | 1 +
 .../olympus/hermione/repository/ScenarioRepository.java   | 8 +++++---
 .../com/olympus/hermione/services/ScenarioService.java    | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/olympus/hermione/models/Scenario.java b/src/main/java/com/olympus/hermione/models/Scenario.java
index ad65ac5..9406c3c 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<ScenarioStep> steps;
     private List<ScenarioInputs> 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<Scenario, String> {
    /*  @Query("{ 'usable_for': ?0 }")
     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);
 
 
 }
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<Scenario> 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<Scenario> 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<Scenario> lstScenarios = null;
         try{
-           lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull();
+           lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNullAndVisible("Y");
         }catch(Exception e){
             logger.error("Exception ScenarioRepository:", e.getMessage());
         }

From ab9b0561352743fbf058a8309e500e9cfd16ce3a Mon Sep 17 00:00:00 2001
From: "andrea.terzani" <andrea.terzani@accenture.com>
Date: Fri, 25 Oct 2024 08:49:34 +0200
Subject: [PATCH 3/3] Add support for wildcard allowed origin patterns in
 CorsConfig

---
 .../java/com/olympus/hermione/security/config/CorsConfig.java    | 1 +
 1 file changed, 1 insertion(+)

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