diff --git a/src/main/java/ru/ulstu/fc/rule/service/VariableService.java b/src/main/java/ru/ulstu/fc/rule/service/VariableService.java index 20cc790..732aebb 100644 --- a/src/main/java/ru/ulstu/fc/rule/service/VariableService.java +++ b/src/main/java/ru/ulstu/fc/rule/service/VariableService.java @@ -14,15 +14,18 @@ public class VariableService { private final VariableRepository variableRepository; private final ProjectService projectService; - public VariableService(VariableRepository variableRepository, ProjectService projectService) { + public VariableService(VariableRepository variableRepository, + ProjectService projectService) { this.variableRepository = variableRepository; this.projectService = projectService; } public Variable getById(Integer id) { - return variableRepository + Variable variable = variableRepository .findById(id) .orElseThrow(() -> new RuntimeException("Variable not found by id")); + checkIsCurrentUserVariableWithThrow(variable); + return variable; } public Variable save(VariableForm variableForm) { @@ -65,4 +68,8 @@ public class VariableService { public List getAllByProject(Integer projectId) { return variableRepository.getByProject(projectService.getById(projectId)); } + + public void checkIsCurrentUserVariableWithThrow(Variable variable) { + projectService.checkIsCurrentUserProjectWithThrow(variable.getProject()); + } }