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

history exec scenario + bug sel project

Browse Source
This commit is contained in:
Florinda
2024-10-30 09:18:09 +01:00
parent ba2f67202c
commit f3c5f1c210
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/olympus/hermione/controllers/ScenarioController.java
View File

@@ -1,5 +1,7 @@
package com.olympus.hermione.controllers;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -92,6 +94,11 @@ public class ScenarioController {
public ScenarioExecution getScenarioExecution(@PathVariable String id) {
return scenarioExecutionRepository.findById(id).get();
}
@GetMapping("/scenariosByUser")
public List<ScenarioExecution> getScenarioByUser() {
return scenarioExecutionService.getListExecutionScenarioByUser();
}

5
src/main/java/com/olympus/hermione/repository/ScenarioExecutionRepository.java
View File

@@ -1,13 +1,18 @@
package com.olympus.hermione.repository;
import java.util.List;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
import com.olympus.hermione.models.Scenario;
import com.olympus.hermione.models.ScenarioExecution;
@Repository
public interface ScenarioExecutionRepository extends CrudRepository<ScenarioExecution, String> {
List<ScenarioExecution> findByExecutedByUserId(String userId);
}

18
src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
View File

@@ -247,8 +247,9 @@ public class ScenarioExecutionService {
User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
scenarioExecution.setExecutedByUserId(principal.getId());
scenarioExecutionInput.getInputs().put("selected_application", principal.getSelectedApplication().getInternal_name());
if(principal.getSelectedApplication()!=null){
scenarioExecutionInput.getInputs().put("selected_application", principal.getSelectedApplication().getInternal_name());
}
scenarioExecutionInput.getInputs().put("selected_project", principal.getSelectedProject().getInternal_name());
}
@@ -302,4 +303,17 @@ public class ScenarioExecutionService {
}
}
public List<ScenarioExecution> getListExecutionScenarioByUser(){
logger.info("getListProjectByUser function:");
List<ScenarioExecution> lstScenarioExecution = null;
User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
lstScenarioExecution = scenarioExecutionRepository.findByExecutedByUserId(principal.getId());
return lstScenarioExecution;
}
}