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

Merge branch 'thermostat-fix' into 'dev'

Browse source 
Thermostats fixed (for scenes)

See merge request sa4-2020/the-sanmarinoes/backend!106
This commit is contained in:
Claudio Maggioni 2020-05-02 14:02:33 +02:00
commit 50508d95be
4 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java
View file

@ -68,7 +68,7 @@ public class SceneController {
.findByIdAndUsername(id, principal.getName())
.orElseThrow(NotFoundException::new);
return sceneService.apply(newScene);
return sceneService.apply(newScene, principal.getName());
}
@PutMapping("/{id}")

8
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
View file

@ -6,9 +6,11 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
import org.springframework.stereotype.Component;
/** A thermostat capable of controlling cooling and heating. */
@Entity
@Component
public class Thermostat extends Switchable implements BooleanTriggerable {
@Override
@ -34,6 +36,12 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
BigDecimal measured = this.getMeasuredTemperature();
BigDecimal target = this.getTargetTemperature();
if (measured == null) {
this.setMode(Thermostat.Mode.IDLE);
return true;
}
BigDecimal delta = target.subtract(measured);
if (delta.abs().doubleValue() < 0.25) {

22
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
View file

@ -37,7 +37,7 @@ public class DeviceService {
}
}
private void triggerTriggers(Device device) {
private void triggerTriggers(Device device, final String username) {
final long deviceId = device.getId();
@ -57,7 +57,7 @@ public class DeviceService {
sceneRepository
.findById(t.getSceneId())
.orElseThrow(IllegalStateException::new))
.forEach(sceneService::apply);
.forEach((s) -> sceneService.apply(s, username));
}
public List<Device> findAll(Long hostId, String username) throws NotFoundException {
@ -97,11 +97,7 @@ public class DeviceService {
}
}
for (Device d : devices) {
if (d instanceof Thermostat) {
thermostatService.populateMeasuredTemperature((Thermostat) d);
}
}
populateComputedFields(devices);
return toList(devices);
} catch (NotFoundException e) {
@ -110,6 +106,14 @@ public class DeviceService {
}
}
public void populateComputedFields(Iterable<Device> devices) {
for (Device d : devices) {
if (d instanceof Thermostat) {
thermostatService.populateMeasuredTemperature((Thermostat) d);
}
}
}
public <T extends Device> T saveAsGuest(T device, String guestUsername, Long hostId)
throws NotFoundException {
final User currentUser = userRepository.findByUsername(guestUsername);
@ -160,7 +164,7 @@ public class DeviceService {
devices.forEach((d) -> propagateUpdateAsOwner(d, username));
if (!fromScene) {
devices.forEach(this::triggerTriggers);
devices.forEach((d) -> triggerTriggers(d, username));
}
return toList(devices);
@ -172,7 +176,7 @@ public class DeviceService {
propagateUpdateAsOwner(device, username);
if (!fromScene) {
triggerTriggers(device);
triggerTriggers(device, username);
}
return device;

7
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java
View file

@ -13,16 +13,17 @@ import org.springframework.stereotype.Component;
public class SceneService {
@Autowired private DeviceRepository<Device> deviceRepository;
@Autowired private DeviceService deviceService;
public List<Device> apply(Scene newScene) {
public List<Device> apply(Scene newScene, String username) {
final List<Device> updated = new ArrayList<>();
for (final State<?> s : newScene.getStates()) {
s.apply();
updated.add(s.getDevice());
}
deviceRepository.saveAll(updated);
deviceService.saveAllAsOwner(updated, username, true);
deviceService.populateComputedFields(updated);
return updated;
}
}