Merge branch 'fix_automations' into 'dev'
fixed some stuff not working on automations See merge request sa4-2020/the-sanmarinoes/backend!95
This commit is contained in:
commit
79c0cd0fc1
2 changed files with 1 additions and 5 deletions
|
@ -24,10 +24,6 @@ public class ScenePriorityController {
|
||||||
|
|
||||||
@Autowired ScenePriorityRepository scenePriorityRepository;
|
@Autowired ScenePriorityRepository scenePriorityRepository;
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
|
||||||
public ScenePriority get(@PathVariable long id) throws NotFoundException {
|
|
||||||
return scenePriorityRepository.findById(id).orElseThrow(NotFoundException::new);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/{automationId}")
|
@GetMapping("/{automationId}")
|
||||||
public List<ScenePriority> getByAutomationId(@PathVariable long automationId)
|
public List<ScenePriority> getByAutomationId(@PathVariable long automationId)
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class ScenePriority {
|
||||||
@GsonExclude
|
@GsonExclude
|
||||||
private Scene scene;
|
private Scene scene;
|
||||||
|
|
||||||
@Column(name = "scene_id", nullable = false, updatable = false, unique = true)
|
@Column(name = "scene_id", nullable = false, updatable = false)
|
||||||
@NotNull
|
@NotNull
|
||||||
private Long sceneId;
|
private Long sceneId;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue