From ba7d5b31d6a976c9548251daa410d04f6a65f9dd Mon Sep 17 00:00:00 2001
From: Florinda <dalia.florinda@accenture.com>
Date: Tue, 22 Oct 2024 18:14:50 +0200
Subject: [PATCH] cross scenarios

---
 .../controllers/ApplicationController.java         |  7 +++++++
 .../hermione/controllers/ScenarioController.java   |  5 +++++
 .../hermione/repository/ScenarioRepository.java    |  1 +
 .../olympus/hermione/services/ScenarioService.java | 14 ++++++++++++++
 src/main/resources/application.properties          |  2 +-
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/olympus/hermione/controllers/ApplicationController.java b/src/main/java/com/olympus/hermione/controllers/ApplicationController.java
index b76a5a2..de52535 100644
--- a/src/main/java/com/olympus/hermione/controllers/ApplicationController.java
+++ b/src/main/java/com/olympus/hermione/controllers/ApplicationController.java
@@ -2,8 +2,10 @@ package com.olympus.hermione.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.olympus.hermione.models.Scenario;
 import com.olympus.hermione.repository.ApplicationRepository;
 import com.olympus.hermione.repository.ProjectRepository;
 import com.olympus.hermione.services.ApplicationService;
@@ -31,6 +33,11 @@ public class ApplicationController {
         return appService.getListApplicationsByProject();
     }
 
+    @GetMapping("/app/{id}")
+    public Application getScenario(@PathVariable String id) {
+        return appRepo.findById(id).get();
+    }
+
     /*@PostMapping("/getApp")
     public Project getUserProjects(@RequestBody String appId) {
         Optional<Application> a = appRepo.findById(appId);
diff --git a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
index 787697f..7c029ea 100644
--- a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
+++ b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
@@ -46,6 +46,11 @@ public class ScenarioController {
         return scenarioService.getListScenariosByApplication(appId.getId());
     }
 
+    @GetMapping("/scenariosCross")
+    public Iterable<Scenario> getScenariosCross() {
+        return scenarioService.getListScenariosCross();
+    }
+
     @GetMapping("/scenarios/{id}")
     public Scenario getScenario(@PathVariable String id) {
         return scenarioRepository.findById(id).get();
diff --git a/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java b/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java
index 652ee5f..9e14813 100644
--- a/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java
+++ b/src/main/java/com/olympus/hermione/repository/ScenarioRepository.java
@@ -22,6 +22,7 @@ public interface ScenarioRepository extends MongoRepository<Scenario, String> {
 
     List<Scenario> findByAvailableForApplications_Id(String projectId);
 
+    List<Scenario> findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull();
 
 
 }
diff --git a/src/main/java/com/olympus/hermione/services/ScenarioService.java b/src/main/java/com/olympus/hermione/services/ScenarioService.java
index 3d22e95..3617d67 100644
--- a/src/main/java/com/olympus/hermione/services/ScenarioService.java
+++ b/src/main/java/com/olympus/hermione/services/ScenarioService.java
@@ -50,4 +50,18 @@ public class ScenarioService {
         return lstScenarios;
 
     }
+
+    public List<Scenario> getListScenariosCross(){
+        logger.info("getListProjectByUser function:");
+        List<Scenario> lstScenarios = null;
+        try{
+           lstScenarios = scenarioRepo.findByAvailableForProjectsIsNullAndAvailableForApplicationsIsNull();
+        }catch(Exception e){
+            logger.error("Exception ScenarioRepository:", e.getMessage());
+        }
+        
+        logger.info("getListProjectByUser function:");
+        return lstScenarios;
+
+    }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 92c72a6..c10a16a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -33,6 +33,6 @@ logging.level.org.springframework.ai.chat.client.advisor=DEBUG
 eureka.client.serviceUrl.defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}
 eureka.instance.preferIpAddress: true
 
-hermione.fe.url = http://127.0.0.1:5173/
+hermione.fe.url = http://localhost:5173
 
 java-parser-module.url: http://java-parser-module-service.olympus.svc.cluster.local:8080
\ No newline at end of file