smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix_automations' into 'dev'

Browse source 
fixed some stuff not working on automations

See merge request sa4-2020/the-sanmarinoes/backend!95
This commit is contained in:
Claudio Maggioni 2020-04-27 17:04:20 +02:00
commit 79c0cd0fc1
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java
View file

@ -24,10 +24,6 @@ public class ScenePriorityController {
@Autowired ScenePriorityRepository scenePriorityRepository;
@GetMapping("/{id}")
public ScenePriority get(@PathVariable long id) throws NotFoundException {
return scenePriorityRepository.findById(id).orElseThrow(NotFoundException::new);
}
@GetMapping("/{automationId}")
public List<ScenePriority> getByAutomationId(@PathVariable long automationId)

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
View file

@ -41,7 +41,7 @@ public class ScenePriority {
@GsonExclude
private Scene scene;
@Column(name = "scene_id", nullable = false, updatable = false, unique = true)
@Column(name = "scene_id", nullable = false, updatable = false)
@NotNull
private Long sceneId;