history exec scenario + bug sel project
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
package com.olympus.hermione.controllers;
|
package com.olympus.hermione.controllers;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
@@ -93,6 +95,11 @@ public class ScenarioController {
|
|||||||
return scenarioExecutionRepository.findById(id).get();
|
return scenarioExecutionRepository.findById(id).get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/scenariosByUser")
|
||||||
|
public List<ScenarioExecution> getScenarioByUser() {
|
||||||
|
return scenarioExecutionService.getListExecutionScenarioByUser();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,18 @@
|
|||||||
package com.olympus.hermione.repository;
|
package com.olympus.hermione.repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.data.repository.CrudRepository;
|
import org.springframework.data.repository.CrudRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import com.olympus.hermione.models.Scenario;
|
||||||
import com.olympus.hermione.models.ScenarioExecution;
|
import com.olympus.hermione.models.ScenarioExecution;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface ScenarioExecutionRepository extends CrudRepository<ScenarioExecution, String> {
|
public interface ScenarioExecutionRepository extends CrudRepository<ScenarioExecution, String> {
|
||||||
|
|
||||||
|
List<ScenarioExecution> findByExecutedByUserId(String userId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -247,8 +247,9 @@ public class ScenarioExecutionService {
|
|||||||
|
|
||||||
User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
|
User principal = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
|
||||||
scenarioExecution.setExecutedByUserId(principal.getId());
|
scenarioExecution.setExecutedByUserId(principal.getId());
|
||||||
|
if(principal.getSelectedApplication()!=null){
|
||||||
scenarioExecutionInput.getInputs().put("selected_application", principal.getSelectedApplication().getInternal_name());
|
scenarioExecutionInput.getInputs().put("selected_application", principal.getSelectedApplication().getInternal_name());
|
||||||
|
}
|
||||||
scenarioExecutionInput.getInputs().put("selected_project", principal.getSelectedProject().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;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user