From 886f43bf62de875cc356a33e9333afb91d468433 Mon Sep 17 00:00:00 2001 From: Jacob Salvi Date: Sat, 25 Apr 2020 14:38:47 +0200 Subject: [PATCH 001/176] small fix to thermostat controller --- .../smarthut/controller/ThermostatController.java | 2 +- .../sanmarinoes/smarthut/models/Thermostat.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 670df76..4cffe89 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -25,6 +25,7 @@ public class ThermostatController { private Thermostat save(Thermostat newT, ThermostatSaveRequest t, final Principal principal) { newT.setTargetTemperature(t.getTargetTemperature()); + thermostatService.populateMeasuredTemperature(newT); newT.setId(t.getId()); newT.setName(t.getName()); newT.setRoomId(t.getRoomId()); @@ -32,7 +33,6 @@ public class ThermostatController { newT.setOn(t.isTurnOn()); newT = deviceService.saveAsOwner(newT, principal.getName()); - thermostatService.populateMeasuredTemperature(newT); return newT; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java index 2dd3772..bb4bef1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java @@ -1,13 +1,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; -import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import com.google.gson.annotations.SerializedName; import java.math.BigDecimal; -import java.util.HashSet; -import java.util.Set; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.OneToMany; import javax.persistence.Transient; import javax.validation.constraints.NotNull; @@ -38,6 +34,10 @@ public class Thermostat extends Switchable implements BooleanTriggerable { BigDecimal measured = this.getMeasuredTemperature(); BigDecimal target = this.getTargetTemperature(); + System.out.println("measured is"); + // System.out.println(measured.getClass().getName()); + System.out.println("target is"); + System.out.println(target.getClass().getName()); BigDecimal delta = target.subtract(measured); if (delta.abs().doubleValue() < 0.25) { @@ -85,9 +85,9 @@ public class Thermostat extends Switchable implements BooleanTriggerable { @Column private boolean useExternalSensors = false; - @OneToMany(mappedBy = "scene", orphanRemoval = true) - @GsonExclude - private Set> triggers = new HashSet<>(); + // @OneToMany(mappedBy = "scene", orphanRemoval = true) + // @GsonExclude + // private Set> triggers = new HashSet<>() /** Creates a thermostat with a temperature sensor and its initial OFF state */ public Thermostat() { From 3d74e02434179c25de37bab92cea0363c054102d Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Fri, 1 May 2020 20:04:44 +0200 Subject: [PATCH 002/176] Fixed GSON serializations of triggers --- .../usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java index 1204a60..4b69a07 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java @@ -4,6 +4,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger; import com.google.gson.*; import java.lang.reflect.Type; import org.springframework.context.annotation.Bean; @@ -27,6 +28,7 @@ public class GsonConfig { private static GsonBuilder configureBuilder() { final GsonBuilder builder = new GsonBuilder(); builder.registerTypeAdapter(Json.class, new SpringfoxJsonToGsonAdapter()); + @SuppressWarnings({"rawTypes"}) RuntimeTypeAdapterFactory runtimeTypeAdapterFactory = RuntimeTypeAdapterFactory.of(State.class, "kind") .registerSubtype(SwitchableState.class, "switchableState") @@ -43,6 +45,10 @@ public class GsonConfig { "rangeTrigger"); builder.registerTypeAdapterFactory(runtimeTypeAdapterFactory); builder.registerTypeAdapterFactory(runtimeTypeAdapterFactoryII); + builder.registerTypeAdapter( + Trigger.class, + (JsonSerializer>) + (src, typeOfSrc, context) -> context.serialize((Object) src)); return builder; } From e0ab831be90a143dd6ee25ff2780eec6045abf52 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 2 May 2020 11:12:11 +0200 Subject: [PATCH 003/176] Thermostats fixed --- .../smarthut/controller/ThermostatController.java | 7 +++++-- .../smarthut/dto/ThermostatSaveRequest.java | 10 ---------- .../sa4/sanmarinoes/smarthut/models/Thermostat.java | 12 ++++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 7a6fc59..12cd09b 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -28,11 +28,14 @@ public class ThermostatController { newT.setId(t.getId()); newT.setName(t.getName()); newT.setRoomId(t.getRoomId()); - newT.setMeasuredTemperature(t.getMeasuredTemperature()); newT.setUseExternalSensors(t.isUseExternalSensors()); - newT.setOn(t.isTurnOn()); + newT.setOn(false); + System.out.println(newT); thermostatService.populateMeasuredTemperature(newT); + newT = thermostatRepository.save(newT); + + newT.setOn(t.isTurnOn()); newT = deviceService.saveAsOwner(newT, principal.getName()); return newT; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java index 3986996..5ac3402 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java @@ -22,8 +22,6 @@ public class ThermostatSaveRequest { @NotNull private boolean useExternalSensors; - @NotNull private BigDecimal measuredTemperature; - /** State of this thermostat */ @NotNull private boolean turnOn; @@ -74,12 +72,4 @@ public class ThermostatSaveRequest { public void setId(long id) { this.id = id; } - - public BigDecimal getMeasuredTemperature() { - return measuredTemperature; - } - - public void setMeasuredTemperature(BigDecimal measuredTemperature) { - this.measuredTemperature = measuredTemperature; - } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java index e8f0e86..c02c4e4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java @@ -87,6 +87,18 @@ public class Thermostat extends Switchable implements BooleanTriggerable { this.mode = Mode.OFF; } + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("Thermostat{"); + sb.append("targetTemperature=").append(targetTemperature); + sb.append(", internalSensorTemperature=").append(internalSensorTemperature); + sb.append(", mode=").append(mode); + sb.append(", measuredTemperature=").append(measuredTemperature); + sb.append(", useExternalSensors=").append(useExternalSensors); + sb.append('}'); + return sb.toString(); + } + public void setMode(Mode state) { this.mode = state; } From c3d6590507a62c9fb9a8a0a4f2e3debd73b15442 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 2 May 2020 13:58:28 +0200 Subject: [PATCH 004/176] Thermostats fixed (for scenes) --- .../smarthut/controller/SceneController.java | 2 +- .../smarthut/models/Thermostat.java | 8 +++++++ .../smarthut/service/DeviceService.java | 22 +++++++++++-------- .../smarthut/service/SceneService.java | 7 +++--- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java index 0cddba2..4de0b89 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java @@ -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}") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java index c02c4e4..e501ba4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java @@ -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) { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index 0bc2a6e..379b86f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -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 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 devices) { + for (Device d : devices) { + if (d instanceof Thermostat) { + thermostatService.populateMeasuredTemperature((Thermostat) d); + } + } + } + public 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; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 826d896..5b6dc7f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -13,16 +13,17 @@ import org.springframework.stereotype.Component; public class SceneService { @Autowired private DeviceRepository deviceRepository; + @Autowired private DeviceService deviceService; - public List apply(Scene newScene) { + public List apply(Scene newScene, String username) { final List 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; } } From 7ae75223591af059078bf2f42208812c3bb46455 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 2 May 2020 14:53:12 +0200 Subject: [PATCH 005/176] Fixed propagation of device updates on automation scene application --- .../controller/ButtonDimmerController.java | 2 +- .../InputDeviceConnectionController.java | 4 +- .../controller/KnobDimmerController.java | 2 +- .../smarthut/controller/SceneController.java | 2 +- .../smarthut/controller/SwitchController.java | 2 +- .../smarthut/service/DeviceService.java | 58 ++++++++++++++----- .../smarthut/service/SceneService.java | 4 +- 7 files changed, 50 insertions(+), 24 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java index 15f4825..2663211 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java @@ -67,7 +67,7 @@ public class ButtonDimmerController break; } - deviceService.saveAllAsOwner(buttonDimmer.getOutputs(), principal.getName(), false); + deviceService.saveAllAsOwner(buttonDimmer.getOutputs(), principal.getName()); return buttonDimmer.getOutputs(); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java index 4d1a371..51ea46e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java @@ -91,7 +91,7 @@ public abstract class InputDeviceConnectionController< connector.connect(pair.input, o, true); } - deviceService.saveAllAsOwner(pair.outputs, username, false); + deviceService.saveAllAsOwner(pair.outputs, username); return pair.input.getOutputs(); } @@ -111,7 +111,7 @@ public abstract class InputDeviceConnectionController< connector.connect(pair.input, o, false); } - deviceService.saveAllAsOwner(pair.outputs, username, false); + deviceService.saveAllAsOwner(pair.outputs, username); return pair.input.getOutputs(); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java index a8333f5..14bdedd 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java @@ -54,7 +54,7 @@ public class KnobDimmerController extends InputDeviceConnectionController sceneService.apply(s, username)); + .forEach((s) -> sceneService.apply(s, username, true)); } public List findAll(Long hostId, String username) throws NotFoundException { @@ -145,7 +145,15 @@ public class DeviceService { return device; } - private void propagateUpdateAsOwner(Device device, String username) { + /** + * Propagates the update through the socket assuming that the user that modified the device is + * the owner of that device + * + * @param device the updated device + * @param username the username of the owner of that device + * @param causedByTrigger if true, send the update to the owner as well + */ + private void propagateUpdateAsOwner(Device device, String username, boolean causedByTrigger) { final User user = userRepository.findByUsername(username); final Set guests = user.getGuests(); // make sure we're broadcasting from host @@ -155,13 +163,33 @@ public class DeviceService { // broadcast to endpoint the object device, with receiving user set to guest endpoint.queueDeviceUpdate(device, guest); } + + if (causedByTrigger) { + endpoint.queueDeviceUpdate(device, user); + } } + /** + * Saves all the devices given in devices assuming that the owner updated them in one way or + * another. Takes care of the appropriate websocket updates and trigger checking as well. No + * checking is done to verify that the user whose username is given is in fact the owner of + * these devices + * + * @param devices the list of devices to save + * @param username the username of the owner of these devices + * @param fromScene true if the update comes from the a scene application side effect. Disables + * trigger checking to avoid recursive invocations of automations + * @param fromTrigger true if the update comes from a scene application executed by an + * automation. Propagates updated through socket to owner as well. No effect if fromScene is + * false. + * @param the type of device contained in the list + * @return the updated list of devices, ready to be fed to GSON + */ public List saveAllAsOwner( - Iterable devices, String username, boolean fromScene) { + Iterable devices, String username, boolean fromScene, boolean fromTrigger) { devices.forEach(d -> renameIfDuplicate(d, username)); devices = deviceRepository.saveAll(devices); - devices.forEach((d) -> propagateUpdateAsOwner(d, username)); + devices.forEach((d) -> propagateUpdateAsOwner(d, username, fromScene && fromTrigger)); if (!fromScene) { devices.forEach((d) -> triggerTriggers(d, username)); @@ -170,20 +198,18 @@ public class DeviceService { return toList(devices); } - public T saveAsOwner(T device, String username, boolean fromScene) { - renameIfDuplicate(device, username); - device = deviceRepository.save(device); - propagateUpdateAsOwner(device, username); - - if (!fromScene) { - triggerTriggers(device, username); - } - - return device; + public List saveAllAsOwner(Iterable devices, String username) { + return saveAllAsOwner(devices, username, false, false); } public T saveAsOwner(T device, String username) { - return saveAsOwner(device, username, false); + renameIfDuplicate(device, username); + device = deviceRepository.save(device); + propagateUpdateAsOwner(device, username, false); + + triggerTriggers(device, username); + + return device; } public void delete(Long id, String username) throws NotFoundException { @@ -193,6 +219,6 @@ public class DeviceService { .orElseThrow(NotFoundException::new); deviceRepository.delete(device); - propagateUpdateAsOwner(device, username); + propagateUpdateAsOwner(device, username, false); } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 5b6dc7f..04a8877 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -15,14 +15,14 @@ public class SceneService { @Autowired private DeviceRepository deviceRepository; @Autowired private DeviceService deviceService; - public List apply(Scene newScene, String username) { + public List apply(Scene newScene, String username, boolean fromTrigger) { final List updated = new ArrayList<>(); for (final State s : newScene.getStates()) { s.apply(); updated.add(s.getDevice()); } - deviceService.saveAllAsOwner(updated, username, true); + deviceService.saveAllAsOwner(updated, username, true, fromTrigger); deviceService.populateComputedFields(updated); return updated; } From 92e93c80e8f1aa064c910d60e068ca8555fca48d Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 2 May 2020 16:41:11 +0200 Subject: [PATCH 006/176] WIP --- .../smarthut/controller/GuestController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java index b0994a1..cfc0f36 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java @@ -4,8 +4,8 @@ import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestPermissionsRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository; import java.security.Principal; import java.util.List; import javax.validation.Valid; @@ -18,13 +18,19 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/user") public class GuestController { - @Autowired private UserRepository userRepository; + @Autowired private EagerUserRepository userRepository; @GetMapping public List findAll() { return toList(userRepository.findAll()); } + @GetMapping("/hosts") + public List findHosts(final Principal principal) { + final User u = userRepository.findByUsername(principal.getName()); + return toList(u.getHosts()); + } + @PostMapping("/guest") public User addUserAsGuest(@RequestParam("userId") long id, final Principal principal) throws NotFoundException { From 6263bd2d3530cbaf64c2b0841365e58c926c7da6 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Sat, 2 May 2020 20:50:50 +0200 Subject: [PATCH 007/176] WIP --- .../smarthut/controller/GuestController.java | 17 +++++++++++------ .../smarthut/dto/UserResponse.java | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java index cfc0f36..8e2274f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java @@ -1,13 +1,15 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller; -import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestPermissionsRequest; +import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; import java.security.Principal; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -21,14 +23,16 @@ public class GuestController { @Autowired private EagerUserRepository userRepository; @GetMapping - public List findAll() { - return toList(userRepository.findAll()); + public List findAll() { + return StreamSupport.stream(userRepository.findAll().spliterator(), false) + .map(UserResponse::fromUser) + .collect(Collectors.toList()); } @GetMapping("/hosts") - public List findHosts(final Principal principal) { + public List findHosts(final Principal principal) { final User u = userRepository.findByUsername(principal.getName()); - return toList(u.getHosts()); + return u.getHosts().stream().map(UserResponse::fromUser).collect(Collectors.toList()); } @PostMapping("/guest") @@ -52,7 +56,7 @@ public class GuestController { } @DeleteMapping("/guest") - public void removeUserAsGuest(@RequestParam("userId") long id, final Principal principal) + public User removeUserAsGuest(@RequestParam("userId") long id, final Principal principal) throws NotFoundException { User guest = userRepository.findById(id).orElseThrow(NotFoundException::new); User host = userRepository.findByUsername(principal.getName()); @@ -61,5 +65,6 @@ public class GuestController { guest.getHosts().remove(host); userRepository.save(host); userRepository.save(guest); + return host; } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java new file mode 100644 index 0000000..2ed2c09 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java @@ -0,0 +1,19 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; + +public class UserResponse { + private Long id; + private String username; + private String name; + + private UserResponse() {} + + public static UserResponse fromUser(User u) { + final UserResponse us = new UserResponse(); + us.name = u.getName(); + us.id = u.getId(); + us.username = u.getUsername(); + return us; + } +} From 25eb9555c0b92204c5bd0b8685bec925226e16c8 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 2 May 2020 22:37:54 +0200 Subject: [PATCH 008/176] Fixed for frontend to guest controllers --- .../smarthut/controller/GuestController.java | 47 +++++++++++-------- .../smarthut/dto/GuestsUpdateRequest.java | 8 ++++ 2 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java index 8e2274f..f010b52 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java @@ -1,13 +1,16 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller; +import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestPermissionsRequest; +import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestsUpdateRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; import java.security.Principal; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.StreamSupport; import javax.validation.Valid; @@ -35,16 +38,33 @@ public class GuestController { return u.getHosts().stream().map(UserResponse::fromUser).collect(Collectors.toList()); } - @PostMapping("/guest") - public User addUserAsGuest(@RequestParam("userId") long id, final Principal principal) + @GetMapping("/guests") + public List findGuests(final Principal principal) { + final User u = userRepository.findByUsername(principal.getName()); + return u.getGuests().stream().map(UserResponse::fromUser).collect(Collectors.toList()); + } + + @PutMapping("/guests") + public List setGuests( + @RequestBody @Valid GuestsUpdateRequest g, final Principal principal) throws NotFoundException { - User guest = userRepository.findById(id).orElseThrow(NotFoundException::new); + Iterable guests = userRepository.findAllById(g.ids); User host = userRepository.findByUsername(principal.getName()); - host.addGuest(guest); - guest.addHost(host); - userRepository.save(guest); - return userRepository.save(host); + for (final User oldGuest : host.getGuests()) { + oldGuest.getHosts().remove(host); + } + + final Set oldGuests = Set.copyOf(host.getGuests()); + + for (final User guest : guests) { + host.addGuest(guest); + guest.addHost(host); + } + + userRepository.saveAll(oldGuests); + userRepository.save(host); + return toList(userRepository.saveAll(guests)); } @PutMapping("/permissions") @@ -54,17 +74,4 @@ public class GuestController { currentUser.setCameraEnabled(g.isCameraEnabled()); return userRepository.save(currentUser); } - - @DeleteMapping("/guest") - public User removeUserAsGuest(@RequestParam("userId") long id, final Principal principal) - throws NotFoundException { - User guest = userRepository.findById(id).orElseThrow(NotFoundException::new); - User host = userRepository.findByUsername(principal.getName()); - - host.removeGuest(guest); - guest.getHosts().remove(host); - userRepository.save(host); - userRepository.save(guest); - return host; - } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java new file mode 100644 index 0000000..6e98937 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java @@ -0,0 +1,8 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; + +import java.util.List; +import javax.validation.constraints.NotNull; + +public class GuestsUpdateRequest { + @NotNull public List ids; +} From aad6cc52ce61a682abfe9863f0a8bbdc45f6c033 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sun, 3 May 2020 14:14:24 +0200 Subject: [PATCH 009/176] Fixed thermostat socket updates --- .../sanmarinoes/smarthut/models/Thermostat.java | 17 ++++------------- .../smarthut/service/ThermostatService.java | 12 +++++------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java index e501ba4..632dfd7 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java @@ -24,14 +24,10 @@ public class Thermostat extends Switchable implements BooleanTriggerable { computeState(); } - /** - * Computes the new thermostat state, for when the thermostat is on; - * - * @return true if the state changed, false if not; - */ - public boolean computeState() { + /** Computes the new thermostat state, for when the thermostat is on */ + public void computeState() { if (mode == Thermostat.Mode.OFF) { - return false; + return; } BigDecimal measured = this.getMeasuredTemperature(); @@ -39,23 +35,18 @@ public class Thermostat extends Switchable implements BooleanTriggerable { if (measured == null) { this.setMode(Thermostat.Mode.IDLE); - return true; + return; } BigDecimal delta = target.subtract(measured); if (delta.abs().doubleValue() < 0.25) { - if (this.getMode() == Thermostat.Mode.IDLE) return false; this.setMode(Thermostat.Mode.IDLE); } else if (delta.signum() > 0) { - if (this.getMode() == Thermostat.Mode.HEATING) return false; this.setMode(Thermostat.Mode.HEATING); } else { - if (this.getMode() == Thermostat.Mode.COOLING) return false; this.setMode(Thermostat.Mode.COOLING); } - - return true; } @Override diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java index cdbb92c..91d0b18 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java @@ -45,18 +45,16 @@ public class ThermostatService { return Utils.toList(all); } - public boolean computeState(Thermostat t) { + public void computeState(Thermostat t) { populateMeasuredTemperature(t); - return t.computeState(); + t.computeState(); } private void updateState(Thermostat t) { - boolean shouldUpdate = this.computeState(t); + this.computeState(t); - if (shouldUpdate) { - deviceService.saveAsOwner(t, thermostatRepository.findUser(t.getId()).getUsername()); - endpoint.queueDeviceUpdate(t, thermostatRepository.findUser(t.getId())); - } + deviceService.saveAsOwner(t, thermostatRepository.findUser(t.getId()).getUsername()); + endpoint.queueDeviceUpdate(t, thermostatRepository.findUser(t.getId())); } public void updateStates() { From 69d1b38ff20f15e8e423b8d58c8cde6e06bab0e9 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sun, 3 May 2020 19:50:00 +0200 Subject: [PATCH 010/176] other minor fixes^2 --- .../sanmarinoes/smarthut/models/Device.java | 14 ++++---- .../smarthut/scheduled/UpdateTasks.java | 2 +- .../smarthut/service/DeviceService.java | 14 +++----- .../smarthut/service/MotionSensorService.java | 4 +-- .../smarthut/service/SensorService.java | 3 +- .../smarthut/service/ThermostatService.java | 2 +- .../smarthut/socket/SensorSocketEndpoint.java | 33 +++++++++++++++---- 7 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java index 397bb1e..d2231d8 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java @@ -71,14 +71,18 @@ public abstract class Device { @SocketGsonExclude private Set> states = new HashSet<>(); - @Transient @GsonExclude private boolean fromHost = false; + @Transient @GsonExclude private Long fromHostId = null; @Transient @GsonExclude private boolean fromGuest = false; @Transient @GsonExclude private boolean deleted = false; - public boolean isFromHost() { - return fromHost; + public Long getFromHostId() { + return fromHostId; + } + + public void setFromHostId(Long fromHostId) { + this.fromHostId = fromHostId; } public boolean isDeleted() { @@ -97,10 +101,6 @@ public abstract class Device { this.fromGuest = fromGuest; } - public void setFromHost(boolean fromHost) { - this.fromHost = fromHost; - } - public long getId() { return id; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java index e701166..ec0f43f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java @@ -78,7 +78,7 @@ public class UpdateTasks { c.forEach( s -> sensorSocketEndpoint.queueDeviceUpdate( - s, sensorRepository.findUser(s.getId()))); + s, sensorRepository.findUser(s.getId()), false, null, false)); } /** Sends device updates through sensor socket in batch every one second */ diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index b4bde1b..a0116c2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -125,21 +125,17 @@ public class DeviceService { // We're telling the host that a guest has modified a device. Therefore, fromGuest becomes // true. - device.setFromHost(false); - device.setFromGuest(true); // broadcast device update to host - endpoint.queueDeviceUpdate(device, host); + endpoint.queueDeviceUpdate(device, host, true, null, false); // We're telling all guests that a higher entity has issued a device update. Therefore, // fromHost becomes true. - device.setFromHost(true); - device.setFromGuest(false); for (final User guest : guests) { if (guest.equals(currentUser)) { continue; } // enqueue all device updates for all other guests - endpoint.queueDeviceUpdate(device, guest); + endpoint.queueDeviceUpdate(device, guest, false, host.getId(), false); } return device; @@ -157,15 +153,13 @@ public class DeviceService { final User user = userRepository.findByUsername(username); final Set guests = user.getGuests(); // make sure we're broadcasting from host - device.setFromHost(true); - device.setFromGuest(false); for (final User guest : guests) { // broadcast to endpoint the object device, with receiving user set to guest - endpoint.queueDeviceUpdate(device, guest); + endpoint.queueDeviceUpdate(device, guest, false, user.getId(), false); } if (causedByTrigger) { - endpoint.queueDeviceUpdate(device, user); + endpoint.queueDeviceUpdate(device, user, false, user.getId(), false); } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java index 01a7401..f4288ee 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java @@ -14,7 +14,7 @@ public class MotionSensorService { @Autowired private MotionSensorRepository motionSensorRepository; /** - * Updates detection status of given motion sensor and propagates update throgh socket + * Updates detection status of given motion sensor and propagates update through socket * * @param sensor the motion sensor to update * @param detected the new detection status @@ -26,7 +26,7 @@ public class MotionSensorService { final MotionSensor toReturn = deviceService.saveAsOwner(sensor, username); sensorSocketEndpoint.queueDeviceUpdate( - sensor, motionSensorRepository.findUser(sensor.getId())); + sensor, motionSensorRepository.findUser(sensor.getId()), false, null, false); return toReturn; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java index 0e4fbbd..532442b 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java @@ -43,7 +43,8 @@ public class SensorService { sensor = deviceService.saveAsOwner( sensor, sensorRepository.findUser(sensor.getId()).getUsername()); - endpoint.queueDeviceUpdate(sensor, sensorRepository.findUser(sensor.getId())); + endpoint.queueDeviceUpdate( + sensor, sensorRepository.findUser(sensor.getId()), false, null, false); return sensor; } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java index 91d0b18..328d092 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java @@ -54,7 +54,7 @@ public class ThermostatService { this.computeState(t); deviceService.saveAsOwner(t, thermostatRepository.findUser(t.getId()).getUsername()); - endpoint.queueDeviceUpdate(t, thermostatRepository.findUser(t.getId())); + endpoint.queueDeviceUpdate(t, thermostatRepository.findUser(t.getId()), false, null, false); } public void updateStates() { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java index b68cb25..4764f18 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java @@ -5,6 +5,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.JWTTokenUtils; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository; +import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; @@ -21,6 +22,8 @@ public class SensorSocketEndpoint extends Endpoint { private Gson gson = GsonConfig.socketGson(); + @Autowired private DeviceService deviceService; + private UserRepository userRepository; private JWTTokenUtils jwtTokenUtils; @@ -28,7 +31,10 @@ public class SensorSocketEndpoint extends Endpoint { private Multimap authorizedClients = Multimaps.synchronizedMultimap(HashMultimap.create()); - private final Map> messages = new HashMap<>(); + // messages are now stored as strings as a "hack" to capture and clone the state of the device, + // since + // fromHost and fromGuest are just mutable properties and hibernate caches the object. + private final Map> messages = new HashMap<>(); @Autowired public SensorSocketEndpoint(UserRepository userRepository, JWTTokenUtils jwtTokenUtils) { @@ -41,18 +47,33 @@ public class SensorSocketEndpoint extends Endpoint { * * @param device the device update to be sent * @param u the user the device belongs + * @param fromGuest value for device.fromGuest. This will be put in the device passed. + * @param fromHostId value for device.fromHostId. This will be put in the device passed. + * @param deleted value for device.deleted. This will be put in the device passed. */ - public void queueDeviceUpdate(Device device, User u) { + public void queueDeviceUpdate( + Device device, User u, boolean fromGuest, Long fromHostId, boolean deleted) { synchronized (messages) { + device.setFromGuest(fromGuest); + device.setFromHostId(fromHostId); + device.setDeleted(deleted); + + // sort of an hack: force the population of thermostat measureTemperature and other + // possible + // computed fields in the future. This should already be done by the callers of this + // method but for + // whatever reason they don't do it. + deviceService.populateComputedFields(List.of(device)); + messages.putIfAbsent(u, new HashMap<>()); - messages.get(u).put(device.getId(), device); + messages.get(u).put(device.getId(), gson.toJson(device)); } } /** Sends all device updates queued to be sent in a unique WebSocket message */ public void flushDeviceUpdates() { synchronized (messages) { - for (Map.Entry> batchForUser : messages.entrySet()) { + for (Map.Entry> batchForUser : messages.entrySet()) { broadcast(batchForUser.getKey(), batchForUser.getValue().values()); batchForUser.getValue().clear(); } @@ -66,13 +87,13 @@ public class SensorSocketEndpoint extends Endpoint { * @param messages the message batch to send * @param u the user to which to send the message */ - private void broadcast(User u, Collection messages) { + private void broadcast(User u, Collection messages) { if (messages.isEmpty()) return; final HashSet sessions = new HashSet<>(authorizedClients.get(u)); for (Session s : sessions) { try { if (s.isOpen()) { - s.getBasicRemote().sendText(gson.toJson(messages)); + s.getBasicRemote().sendText("[" + String.join(",", messages) + "]"); } else { authorizedClients.remove(u, s); } From 21bc66d24b35cd1c5b4cbd38bf9a8de0a952d527 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Mon, 4 May 2020 11:58:03 +0200 Subject: [PATCH 011/176] Deletion propagation implemented --- .../controller/ButtonDimmerController.java | 2 +- .../smarthut/controller/CurtainsController.java | 2 +- .../controller/DimmableLightController.java | 6 ++++-- .../smarthut/controller/KnobDimmerController.java | 2 +- .../controller/MotionSensorController.java | 2 +- .../controller/RegularLightController.java | 6 ++++-- .../smarthut/controller/RoomController.java | 5 +++++ .../controller/SecurityCameraController.java | 2 +- .../smarthut/controller/SensorController.java | 2 +- .../smarthut/controller/SmartPlugController.java | 2 +- .../smarthut/controller/SwitchController.java | 2 +- .../smarthut/controller/ThermostatController.java | 2 +- .../sanmarinoes/smarthut/models/Automation.java | 2 +- .../sa4/sanmarinoes/smarthut/models/Switch.java | 8 +++++++- .../sanmarinoes/smarthut/models/Switchable.java | 9 ++++++++- .../smarthut/service/DeviceService.java | 15 +++++++++++---- 16 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java index 2663211..cf2cb56 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java @@ -75,6 +75,6 @@ public class ButtonDimmerController @DeleteMapping("/{id}") public void delete(@PathVariable("id") long id, final Principal principal) throws NotFoundException { - deviceService.delete(id, principal.getName()); + deviceService.deleteByIdAsOwner(id, principal.getName()); } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java index 6644135..4065f12 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java @@ -49,7 +49,7 @@ public class CurtainsController { @DeleteMapping("/{id}") public void delete(@PathVariable("id") long id, final Principal principal) throws NotFoundException { - deviceService.delete(id, principal.getName()); + deviceService.deleteByIdAsOwner(id, principal.getName()); } @PostMapping("/{id}/state") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java index 60a4726..28648c1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java @@ -66,7 +66,9 @@ public class DimmableLightController extends GuestEnabledController @PutMapping public RegularLight update( - @Valid @RequestBody SwitchableSaveRequest rl, final Principal principal, Long hostId) + @Valid @RequestBody SwitchableSaveRequest rl, + final Principal principal, + @RequestParam(value = "hostId", required = false) Long hostId) throws NotFoundException { return save( fetchIfOwnerOrGuest(principal, rl.getId(), hostId), @@ -92,7 +94,7 @@ public class RegularLightController extends GuestEnabledController @DeleteMapping("/{id}") public void delete(@PathVariable("id") long id, final Principal principal) throws NotFoundException { - deviceService.delete(id, principal.getName()); + deviceService.deleteByIdAsOwner(id, principal.getName()); } // the full url should be: "/regularLight/{id}/state?sceneId={sceneId} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java index c4540c5..e6ab648 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java @@ -124,6 +124,11 @@ public class RoomController { roomRepository .findByIdAndUsername(id, principal.getName()) .orElseThrow(NotFoundException::new); + List devices = deviceService.findAll(r.getId(), null, principal.getName()); + for (Device d : devices) { + deviceService.deleteByIdAsOwner(d.getId(), principal.getName()); + } + roomRepository.delete(r); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java index c063ebf..1554f0a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java @@ -61,7 +61,7 @@ public class SecurityCameraController { @DeleteMapping("/{id}") public void delete(@PathVariable("id") long id, final Principal principal) throws NotFoundException { - deviceService.delete(id, principal.getName()); + deviceService.deleteByIdAsOwner(id, principal.getName()); } @PostMapping("/{id}/state") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java index 41b9af0..3833452 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java @@ -57,6 +57,6 @@ public class SensorController { @DeleteMapping("/{id}") public void deleteById(@PathVariable("id") long id, final Principal principal) throws NotFoundException { - deviceService.delete(id, principal.getName()); + deviceService.deleteByIdAsOwner(id, principal.getName()); } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java index 468cd5d..790aee2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java @@ -63,7 +63,7 @@ public class SmartPlugController { @DeleteMapping("/{id}") public void deleteById(@PathVariable("id") long id, final Principal principal) throws NotFoundException { - deviceService.delete(id, principal.getName()); + deviceService.deleteByIdAsOwner(id, principal.getName()); } @PostMapping("/{id}/state") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java index 6806b64..d92cd49 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java @@ -81,6 +81,6 @@ public class SwitchController extends InputDeviceConnectionController> triggers = new HashSet<>(); @OneToMany(mappedBy = "automation", cascade = CascadeType.REMOVE) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java index 4b9ef3a..7825eae 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java @@ -10,7 +10,13 @@ import javax.persistence.*; @Entity public class Switch extends InputDevice implements BooleanTriggerable { - @ManyToMany(cascade = CascadeType.DETACH) + @ManyToMany( + cascade = { + CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.REFRESH, + CascadeType.PERSIST + }) @GsonExclude @SocketGsonExclude @JoinTable( diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java index c7abc7e..9db6361 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java @@ -14,7 +14,14 @@ public abstract class Switchable extends OutputDevice { public static final Connector SWITCH_SWITCHABLE_CONNECTOR = Connector.basic(Switch::getOutputs, Switchable::getSwitches); - @ManyToMany(mappedBy = "switchables", cascade = CascadeType.DETACH) + @ManyToMany( + mappedBy = "switchables", + cascade = { + CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.REFRESH, + CascadeType.PERSIST + }) @GsonExclude @SocketGsonExclude private Set inputs = new HashSet<>(); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index a0116c2..b0a8d7a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -206,13 +206,20 @@ public class DeviceService { return device; } - public void delete(Long id, String username) throws NotFoundException { - Device device = + public void deleteByIdAsOwner(Long id, String username) throws NotFoundException { + Device d = deviceRepository .findByIdAndUsername(id, username) .orElseThrow(NotFoundException::new); - deviceRepository.delete(device); - propagateUpdateAsOwner(device, username, false); + final User user = userRepository.findByUsername(username); + final Set guests = user.getGuests(); + // make sure we're broadcasting from host + for (final User guest : guests) { + // broadcast to endpoint the object device, with receiving user set to guest + endpoint.queueDeviceUpdate(d, guest, false, user.getId(), true); + } + + deviceRepository.delete(d); } } From 5bfce7e99b7555f102094e18ab3065d95a11d1e5 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Mon, 4 May 2020 15:09:11 +0200 Subject: [PATCH 012/176] Added icons to scenes --- .../smarthut/controller/RoomController.java | 4 +- .../smarthut/controller/SceneController.java | 3 + .../smarthut/dto/RoomSaveRequest.java | 8 +- .../smarthut/dto/SceneSaveRequest.java | 11 ++ .../sa4/sanmarinoes/smarthut/models/Icon.java | 103 ++++++++++++++++++ .../sa4/sanmarinoes/smarthut/models/Room.java | 101 ----------------- .../sanmarinoes/smarthut/models/Scene.java | 12 ++ 7 files changed, 135 insertions(+), 107 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Icon.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java index e6ab648..8b7f648 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java @@ -75,7 +75,7 @@ public class RoomController { final String username = principal.getName(); final Long userId = userRepository.findByUsername(username).getId(); final String img = r.getImage(); - final Room.Icon icon = r.getIcon(); + final Icon icon = r.getIcon(); final Room newRoom = new Room(); newRoom.setUserId(userId); @@ -95,7 +95,7 @@ public class RoomController { .findByIdAndUsername(id, principal.getName()) .orElseThrow(NotFoundException::new); final String img = r.getImage(); - final Room.Icon icon = r.getIcon(); + final Icon icon = r.getIcon(); if (r.getName() != null) { newRoom.setName(r.getName()); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java index 66dc5aa..c795049 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java @@ -56,6 +56,7 @@ public class SceneController { newScene.setUserId(userId); newScene.setName(s.getName()); newScene.setGuestAccessEnabled(s.isGuestAccessEnabled()); + newScene.setIcon(s.getIcon()); return sceneRepository.save(newScene); } @@ -84,6 +85,8 @@ public class SceneController { newScene.setName(s.getName()); } + newScene.setIcon(s.getIcon()); + newScene.setGuestAccessEnabled(s.isGuestAccessEnabled()); return sceneRepository.save(newScene); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java index 02a0e35..cf362ac 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java @@ -1,6 +1,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon; import javax.persistence.Lob; import javax.validation.constraints.NotNull; @@ -9,7 +9,7 @@ public class RoomSaveRequest { /** Room identifier */ private long id; - @NotNull private Room.Icon icon; + @NotNull private Icon icon; /** * Image is to be given as byte[]. In order to get an encoded string from it, the @@ -38,11 +38,11 @@ public class RoomSaveRequest { this.name = name; } - public Room.Icon getIcon() { + public Icon getIcon() { return icon; } - public void setIcon(Room.Icon icon) { + public void setIcon(Icon icon) { this.icon = icon; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java index 080ea2b..e7ce3ad 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java @@ -1,5 +1,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon; import com.sun.istack.NotNull; import javax.persistence.Column; @@ -11,6 +12,8 @@ public class SceneSaveRequest { /** The user given name of this room (e.g. 'Master bedroom') */ @NotNull private String name; + @NotNull private Icon icon; + /** Determines whether a guest can access this scene */ @Column @NotNull private boolean guestAccessEnabled; @@ -33,4 +36,12 @@ public class SceneSaveRequest { public void setName(String name) { this.name = name; } + + public Icon getIcon() { + return icon; + } + + public void setIcon(Icon icon) { + this.icon = icon; + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Icon.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Icon.java new file mode 100644 index 0000000..0ad9e4d --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Icon.java @@ -0,0 +1,103 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import com.google.gson.annotations.SerializedName; + +/** A collection of Semantic UI icons */ +@SuppressWarnings("unused") +public enum Icon { + @SerializedName("home") + HOME("home"), + @SerializedName("coffee") + COFFEE("coffee"), + @SerializedName("beer") + BEER("beer"), + @SerializedName("glass martini") + GLASS_MARTINI("glass martini"), + @SerializedName("film") + FILM("film"), + @SerializedName("video") + VIDEO("video"), + @SerializedName("music") + MUSIC("music"), + @SerializedName("headphones") + HEADPHONES("headphones"), + @SerializedName("fax") + FAX("fax"), + @SerializedName("phone") + PHONE("phone"), + @SerializedName("laptop") + LAPTOP("laptop"), + @SerializedName("bath") + BATH("bath"), + @SerializedName("shower") + SHOWER("shower"), + @SerializedName("bed") + BED("bed"), + @SerializedName("child") + CHILD("child"), + @SerializedName("warehouse") + WAREHOUSE("warehouse"), + @SerializedName("car") + CAR("car"), + @SerializedName("bicycle") + BICYCLE("bicycle"), + @SerializedName("motorcycle") + MOTORCYCLE("motorcycle"), + @SerializedName("archive") + ARCHIVE("archive"), + @SerializedName("boxes") + BOXES("boxes"), + @SerializedName("cubes") + CUBES("cubes"), + @SerializedName("chess") + CHESS("chess"), + @SerializedName("gamepad") + GAMEPAD("gamepad"), + @SerializedName("futbol") + FUTBOL("futbol"), + @SerializedName("table tennis") + TABLE_TENNIS("table tennis"), + @SerializedName("server") + SERVER("server"), + @SerializedName("tv") + TV("tv"), + @SerializedName("heart") + HEART("heart"), + @SerializedName("camera") + CAMERA("camera"), + @SerializedName("trophy") + TROPHY("trophy"), + @SerializedName("wrench") + WRENCH("wrench"), + @SerializedName("image") + IMAGE("image"), + @SerializedName("book") + BOOK("book"), + @SerializedName("university") + UNIVERSITY("university"), + @SerializedName("medkit") + MEDKIT("medkit"), + @SerializedName("paw") + PAW("paw"), + @SerializedName("tree") + TREE("tree"), + @SerializedName("utensils") + UTENSILS("utensils"), + @SerializedName("male") + MALE("male"), + @SerializedName("female") + FEMALE("female"), + @SerializedName("life ring outline") + LIFE_RING_OUTLINE("life ring outline"); + + private String iconName; + + Icon(String s) { + this.iconName = s; + } + + @Override + public String toString() { + return iconName; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java index 34f3824..73d7794 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java @@ -1,7 +1,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; -import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModelProperty; import java.util.HashSet; import java.util.Set; @@ -12,106 +11,6 @@ import javax.validation.constraints.NotNull; @Entity public class Room { - /** A collection of Semantic UI icons */ - @SuppressWarnings("unused") - public enum Icon { - @SerializedName("home") - HOME("home"), - @SerializedName("coffee") - COFFEE("coffee"), - @SerializedName("beer") - BEER("beer"), - @SerializedName("glass martini") - GLASS_MARTINI("glass martini"), - @SerializedName("film") - FILM("film"), - @SerializedName("video") - VIDEO("video"), - @SerializedName("music") - MUSIC("music"), - @SerializedName("headphones") - HEADPHONES("headphones"), - @SerializedName("fax") - FAX("fax"), - @SerializedName("phone") - PHONE("phone"), - @SerializedName("laptop") - LAPTOP("laptop"), - @SerializedName("bath") - BATH("bath"), - @SerializedName("shower") - SHOWER("shower"), - @SerializedName("bed") - BED("bed"), - @SerializedName("child") - CHILD("child"), - @SerializedName("warehouse") - WAREHOUSE("warehouse"), - @SerializedName("car") - CAR("car"), - @SerializedName("bicycle") - BICYCLE("bicycle"), - @SerializedName("motorcycle") - MOTORCYCLE("motorcycle"), - @SerializedName("archive") - ARCHIVE("archive"), - @SerializedName("boxes") - BOXES("boxes"), - @SerializedName("cubes") - CUBES("cubes"), - @SerializedName("chess") - CHESS("chess"), - @SerializedName("gamepad") - GAMEPAD("gamepad"), - @SerializedName("futbol") - FUTBOL("futbol"), - @SerializedName("table tennis") - TABLE_TENNIS("table tennis"), - @SerializedName("server") - SERVER("server"), - @SerializedName("tv") - TV("tv"), - @SerializedName("heart") - HEART("heart"), - @SerializedName("camera") - CAMERA("camera"), - @SerializedName("trophy") - TROPHY("trophy"), - @SerializedName("wrench") - WRENCH("wrench"), - @SerializedName("image") - IMAGE("image"), - @SerializedName("book") - BOOK("book"), - @SerializedName("university") - UNIVERSITY("university"), - @SerializedName("medkit") - MEDKIT("medkit"), - @SerializedName("paw") - PAW("paw"), - @SerializedName("tree") - TREE("tree"), - @SerializedName("utensils") - UTENSILS("utensils"), - @SerializedName("male") - MALE("male"), - @SerializedName("female") - FEMALE("female"), - @SerializedName("life ring outline") - LIFE_RING_OUTLINE("life ring outline"); - - private String iconName; - - Icon(String s) { - this.iconName = s; - } - - @Override - public String toString() { - return iconName; - } - } - @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "id", updatable = false, nullable = false, unique = true) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java index f35d54d..83a9367 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java @@ -39,9 +39,21 @@ public class Scene { @Column(nullable = false) private String name; + @Column(nullable = false) + @NotNull + private Icon icon; + /** Determines whether a guest can access this scene */ @Column private boolean guestAccessEnabled; + public Icon getIcon() { + return icon; + } + + public void setIcon(Icon icon) { + this.icon = icon; + } + public boolean isGuestAccessEnabled() { return guestAccessEnabled; } From 16d1af2b368c6dd05a856c48f3056baa1250f4f7 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Mon, 4 May 2020 16:10:17 +0200 Subject: [PATCH 013/176] Scene copy implemented --- .../smarthut/controller/SceneController.java | 18 ++++++++++++++++++ .../smarthut/models/DimmableState.java | 7 +++++++ .../sa4/sanmarinoes/smarthut/models/State.java | 10 ++++++++++ .../smarthut/models/SwitchableState.java | 7 +++++++ .../smarthut/service/SceneService.java | 14 ++++++++++---- 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java index c795049..a11b40e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java @@ -72,6 +72,24 @@ public class SceneController { return sceneService.apply(newScene, principal.getName(), false); } + @PostMapping("/{id}/copyFrom/{copyId}") + public @ResponseBody List> copy( + @PathVariable("id") long id, + @PathVariable("copyId") long copyId, + final Principal principal) + throws NotFoundException { + final Scene scene = + sceneRepository + .findByIdAndUsername(id, principal.getName()) + .orElseThrow(NotFoundException::new); + final Scene copyFrom = + sceneRepository + .findByIdAndUsername(copyId, principal.getName()) + .orElseThrow(NotFoundException::new); + + return sceneService.copyStates(scene, copyFrom); + } + @PutMapping("/{id}") public @ResponseBody Scene update( @PathVariable("id") long id, @RequestBody SceneSaveRequest s, final Principal principal) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java index 7c0b8d2..dff0143 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java @@ -25,4 +25,11 @@ public class DimmableState extends State { public void apply() { getDevice().readStateAndSet(this); } + + @Override + protected State copy() { + final DimmableState d = new DimmableState<>(); + d.setIntensity(intensity); + return d; + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java index 01398b8..31cd69c 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java @@ -45,6 +45,16 @@ public abstract class State { /** Sets the state of the connected device to the state represented by this object. */ public abstract void apply(); + /** Creates a perfect copy of this state, except for the id field and the sceneId/scene */ + protected abstract State copy(); + + public State copyToSceneId(Long sceneId) { + final State s = copy(); + s.setDeviceId(this.deviceId); + s.setSceneId(sceneId); + return s; + } + public long getId() { return id; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java index 67b3118..be21b6e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java @@ -22,4 +22,11 @@ public class SwitchableState extends State { public void apply() { getDevice().readStateAndSet(this); } + + @Override + protected State copy() { + final SwitchableState d = new SwitchableState<>(); + d.setOn(on); + return d; + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 04a8877..72abf08 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -1,9 +1,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.service; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene; -import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +11,7 @@ public class SceneService { @Autowired private DeviceRepository deviceRepository; @Autowired private DeviceService deviceService; + @Autowired private StateRepository> stateRepository; public List apply(Scene newScene, String username, boolean fromTrigger) { final List updated = new ArrayList<>(); @@ -26,4 +24,12 @@ public class SceneService { deviceService.populateComputedFields(updated); return updated; } + + public List> copyStates(Scene to, Scene from) { + final ArrayList> states = new ArrayList<>(); + for (final State s : from.getStates()) { + states.add(stateRepository.save(s.copyToSceneId(to.getId()))); + } + return states; + } } From c24598cc6af958fe52db311d9c92a9d1ec25e72e Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Mon, 4 May 2020 16:35:46 +0200 Subject: [PATCH 014/176] Done security camera filtering if required by host --- .../smarthut/service/DeviceService.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index b0a8d7a..789b53a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -9,6 +9,8 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -68,6 +70,7 @@ public class DeviceService { throws NotFoundException { try { Iterable devices; + User host = null; if (hostId == null) { if (roomId != null) { roomRepository @@ -79,8 +82,7 @@ public class DeviceService { } } else { final User guest = userRepository.findByUsername(username); - final User host = - userRepository.findById(hostId).orElseThrow(NotFoundException::new); + host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); if (!guest.getHosts().contains(host)) { throw new NotFoundException(); @@ -99,7 +101,13 @@ public class DeviceService { populateComputedFields(devices); - return toList(devices); + if (host != null && !host.isCameraEnabled()) { + return StreamSupport.stream(devices.spliterator(), true) + .filter(d -> !(d instanceof SecurityCamera)) + .collect(Collectors.toList()); + } else { + return toList(devices); + } } catch (NotFoundException e) { e.printStackTrace(); throw e; From a278a9f7b35744e858d5c96a0714529000c96375 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Mon, 4 May 2020 17:11:59 +0200 Subject: [PATCH 015/176] Reviewed GET /scene?hostId= and GET /scene/{sceneId}/apply?hostId= --- .../smarthut/controller/SceneController.java | 65 ++++++++++--------- .../smarthut/models/SceneRepository.java | 5 ++ .../smarthut/service/DeviceService.java | 21 ++++-- .../smarthut/service/SceneService.java | 18 ++++- 4 files changed, 72 insertions(+), 37 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java index a11b40e..2eeaaef 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java @@ -6,20 +6,13 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SceneSaveRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.SceneService; +import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils; import java.security.Principal; import java.util.List; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @EnableAutoConfiguration @@ -27,21 +20,20 @@ import org.springframework.web.bind.annotation.RestController; public class SceneController { @Autowired private SceneRepository sceneRepository; + @Autowired private UserRepository userRepository; @Autowired private SceneService sceneService; - @Autowired private UserRepository userService; - @Autowired private StateRepository> stateService; + @Autowired private StateRepository> stateRepository; @GetMapping - public List findAll(Principal principal) { - return toList(sceneRepository.findByUsername(principal.getName())); - } - - @GetMapping("/{id}") - public @ResponseBody Scene findById(@PathVariable("id") long id, Principal principal) + public List findAll( + Principal principal, @RequestParam(value = "hostId", required = false) Long hostId) throws NotFoundException { - return sceneRepository - .findByIdAndUsername(id, principal.getName()) - .orElseThrow(NotFoundException::new); + if (hostId == null) { + return toList(sceneRepository.findByUsername(principal.getName())); + } else { + Utils.returnIfGuest(userRepository, null, hostId, principal); + return sceneRepository.findByHostId(hostId); + } } @PostMapping @@ -49,7 +41,7 @@ public class SceneController { @Valid @RequestBody SceneSaveRequest s, final Principal principal) { final String username = principal.getName(); - final Long userId = userService.findByUsername(username).getId(); + final Long userId = userRepository.findByUsername(username).getId(); final Scene newScene = new Scene(); @@ -62,14 +54,27 @@ public class SceneController { } @PostMapping("/{id}/apply") - public @ResponseBody List apply(@PathVariable("id") long id, final Principal principal) + public @ResponseBody List apply( + @PathVariable("id") long id, + final Principal principal, + @RequestParam(value = "hostId", required = false) Long hostId) throws NotFoundException { - final Scene newScene = - sceneRepository - .findByIdAndUsername(id, principal.getName()) - .orElseThrow(NotFoundException::new); - - return sceneService.apply(newScene, principal.getName(), false); + if (hostId == null) { + return sceneService.apply( + sceneRepository + .findByIdAndUsername(id, principal.getName()) + .orElseThrow(NotFoundException::new), + principal.getName(), + false); + } else { + Utils.returnIfGuest(userRepository, null, hostId, principal); + return sceneService.applyAsGuest( + sceneRepository + .findByIdAndUserId(id, hostId) + .orElseThrow(NotFoundException::new), + principal.getName(), + hostId); + } } @PostMapping("/{id}/copyFrom/{copyId}") @@ -112,7 +117,7 @@ public class SceneController { @DeleteMapping("/{id}") public void deleteById(@PathVariable("id") long id) { - stateService.deleteAllBySceneId(id); + stateRepository.deleteAllBySceneId(id); sceneRepository.deleteById(id); } @@ -122,7 +127,7 @@ public class SceneController { */ @GetMapping(path = "/{sceneId}/states") public List> getDevices(@PathVariable("sceneId") long sceneId) { - Iterable> states = stateService.findBySceneId(sceneId); + Iterable> states = stateRepository.findBySceneId(sceneId); return toList(states); } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java index a4aa68c..028f292 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java @@ -19,4 +19,9 @@ public interface SceneRepository extends CrudRepository { @Query("SELECT s FROM Scene s JOIN s.user u WHERE u.username = ?1") List findByUsername(String username); + + @Query("SELECT s FROM Scene s JOIN s.user u WHERE u.id = ?1 AND s.guestAccessEnabled = true") + List findByHostId(Long hostId); + + Optional findByIdAndUserId(Long id, Long userId); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index 789b53a..d2b02a6 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -128,7 +128,13 @@ public class DeviceService { final User host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); if (!host.getGuests().contains(currentUser)) throw new NotFoundException(); renameIfDuplicate(device, host.getUsername()); + device = deviceRepository.save(device); + propagateUpdateAsGuest(device, host, currentUser); + return device; + } + + private void propagateUpdateAsGuest(Device device, User host, User guest) { final Set guests = Set.copyOf(host.getGuests()); // We're telling the host that a guest has modified a device. Therefore, fromGuest becomes @@ -138,15 +144,22 @@ public class DeviceService { // We're telling all guests that a higher entity has issued a device update. Therefore, // fromHost becomes true. - for (final User guest : guests) { - if (guest.equals(currentUser)) { + for (final User aGuest : guests) { + if (aGuest.equals(guest)) { continue; } // enqueue all device updates for all other guests - endpoint.queueDeviceUpdate(device, guest, false, host.getId(), false); + endpoint.queueDeviceUpdate(device, aGuest, false, host.getId(), false); } + } - return device; + List saveAllAsGuestSceneApplication( + List devices, String guestUsername, Long hostId) { + final User guest = userRepository.findByUsername(guestUsername); + final User host = userRepository.findById(hostId).orElseThrow(IllegalStateException::new); + deviceRepository.saveAll(devices); + devices.forEach(d -> this.propagateUpdateAsGuest(d, host, guest)); + return devices; } /** diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 72abf08..3c91277 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -13,18 +13,30 @@ public class SceneService { @Autowired private DeviceService deviceService; @Autowired private StateRepository> stateRepository; - public List apply(Scene newScene, String username, boolean fromTrigger) { + private List copyStatesToDevices(Scene fromScene) { final List updated = new ArrayList<>(); - for (final State s : newScene.getStates()) { + for (final State s : fromScene.getStates()) { s.apply(); updated.add(s.getDevice()); } - deviceService.saveAllAsOwner(updated, username, true, fromTrigger); + deviceService.populateComputedFields(updated); return updated; } + public List apply(Scene newScene, String username, boolean fromTrigger) { + List updated = copyStatesToDevices(newScene); + deviceService.saveAllAsOwner(updated, username, true, fromTrigger); + return updated; + } + + public List applyAsGuest(Scene newScene, String username, Long hostId) { + List updated = copyStatesToDevices(newScene); + deviceService.saveAllAsGuestSceneApplication(updated, username, hostId); + return updated; + } + public List> copyStates(Scene to, Scene from) { final ArrayList> states = new ArrayList<>(); for (final State s : from.getStates()) { From ddcdaccbe05c33cc66ce531a2af21d403eb67701 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Tue, 5 May 2020 16:31:54 +0200 Subject: [PATCH 016/176] Check Scene.guestAccessEnabled flag on guest application of scene --- .../sa4/sanmarinoes/smarthut/controller/SceneController.java | 2 +- .../inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java index 2eeaaef..f2d0795 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java @@ -70,7 +70,7 @@ public class SceneController { Utils.returnIfGuest(userRepository, null, hostId, principal); return sceneService.applyAsGuest( sceneRepository - .findByIdAndUserId(id, hostId) + .findByIdAndUserIdAndGuestAccessEnabled(id, hostId, true) .orElseThrow(NotFoundException::new), principal.getName(), hostId); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java index 028f292..8b6e4f1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneRepository.java @@ -23,5 +23,6 @@ public interface SceneRepository extends CrudRepository { @Query("SELECT s FROM Scene s JOIN s.user u WHERE u.id = ?1 AND s.guestAccessEnabled = true") List findByHostId(Long hostId); - Optional findByIdAndUserId(Long id, Long userId); + Optional findByIdAndUserIdAndGuestAccessEnabled( + Long id, Long userId, boolean guestAccessEnabled); } From 29d1022700a0f402dbcd4c9c9fb443810a22ccaa Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Wed, 6 May 2020 12:10:45 +0200 Subject: [PATCH 017/176] Added updated mailmap for everyone in the repo --- .mailmap | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..ed9f7e4 --- /dev/null +++ b/.mailmap @@ -0,0 +1,8 @@ +Claudio Maggioni Claudio Maggioni (maggicl) +Claudio Maggioni Claudio Maggioni (maggicl) +Filippo Cesana FilippoCesana +Filippo Cesana Fil Cesana +Andrea Brites Marto britea +Christian Capeáns Pérez christiancp +Tommaso Rodolfo Masera tommi27 +Matteo Omenetti omenem From 6060e627ddcdf240c42e10845aa125137af058ff Mon Sep 17 00:00:00 2001 From: omenem Date: Thu, 7 May 2020 10:01:51 +0200 Subject: [PATCH 018/176] wip --- .../smarthut/models/BooleanCondition.java | 28 ++++ .../smarthut/models/Condition.java | 133 ++++++++++++++++++ .../smarthut/models/RangeCondition.java | 52 +++++++ 3 files changed, 213 insertions(+) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java new file mode 100644 index 0000000..0957ce1 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java @@ -0,0 +1,28 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import javax.persistence.Column; +import javax.persistence.Entity; + +@Entity +public class BooleanCondition + extends Condition { // TODO add interface to type constraints + + @Column(name = "switchable_on") + private boolean on; + + public BooleanCondition() { + super("booleanCondition"); + } + + public boolean isOn() { + return on; + } + + public void setOn(boolean on) { + this.on = on; + } + + public boolean check(boolean on) { + return this.on == on; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java new file mode 100644 index 0000000..9366e90 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java @@ -0,0 +1,133 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; +import io.swagger.annotations.ApiModelProperty; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Transient; +import javax.validation.constraints.NotNull; + +@Entity +public class Condition { + + @Transient private String kind; + + protected Condition(String kind) { + this.kind = kind; + } + + public String getKind() { + return kind; + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "id", updatable = false, nullable = false, unique = true) + @ApiModelProperty(hidden = true) + private long id; + + @ManyToOne + @JoinColumn(name = "user_id", updatable = false, insertable = false) + @GsonExclude + private User user; + + @NotNull + @Column(name = "user_id", nullable = false) + @GsonExclude + private Long userId; + + @NotNull + @Column(nullable = false) + private String name; + + @ManyToOne(targetEntity = Device.class) + @JoinColumn(name = "device_id", updatable = false, insertable = false) + @GsonExclude + private D device; + + /** + * The device this condition belongs to, as a foreign key id. To use when updating and inserting + * from a REST call. + */ + @Column(name = "device_id", nullable = false) + @NotNull + private Long deviceId; + + @ManyToOne + @JoinColumn(name = "automation_id", updatable = false, insertable = false) + @GsonExclude + private Automation automation; + + @Column(name = "automation_id", nullable = false) + @NotNull + private Long automationId; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public D getDevice() { + return device; + } + + public void setDevice(D device) { + this.device = device; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public Automation getAutomation() { + return automation; + } + + public void setAutomation(Automation automation) { + this.automation = automation; + } + + public Long getAutomationId() { + return automationId; + } + + public void setAutomationId(Long automationId) { + this.automationId = automationId; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java new file mode 100644 index 0000000..8283245 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java @@ -0,0 +1,52 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger.Operator; +import com.google.gson.annotations.SerializedName; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.validation.constraints.NotNull; + +@Entity +public class RangeCondition extends Condition { + + protected RangeCondition(String kind) { + super(kind); + } + + public enum Operator { + @SerializedName("EQUAL") + EQUAL, + @SerializedName("LESS") + LESS, + @SerializedName("GREATER") + GREATER, + @SerializedName("LESS_EQUAL") + LESS_EQUAL, + @SerializedName("GREATER_EQUAL") + GREATER_EQUAL + } + + @NotNull + @Column(nullable = false) + private RangeTrigger.Operator operator; + + @NotNull + @Column(nullable = false) + private double range; + + public RangeTrigger.Operator getOperator() { + return operator; + } + + public void setOperator(RangeTrigger.Operator operator) { + this.operator = operator; + } + + public double getRange() { + return range; + } + + public void setRange(Double range) { + this.range = range; + } +} From 74364effe6773408e33c61d907b6c9778255650b Mon Sep 17 00:00:00 2001 From: omenem Date: Thu, 7 May 2020 10:04:05 +0200 Subject: [PATCH 019/176] wip --- .../inf/sa4/sanmarinoes/smarthut/models/Automation.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java index e17e870..18eb71a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java @@ -33,6 +33,9 @@ public class Automation { @OneToMany(mappedBy = "automation", cascade = CascadeType.REMOVE) private Set scenes = new HashSet<>(); + @OneToMany(mappedBy = "automation", orphanRemoval = true, cascade = CascadeType.REMOVE) + private Set> conditions = new HashSet<>(); + @NotNull @NotEmpty private String name; public long getId() { @@ -78,4 +81,8 @@ public class Automation { public void setUserId(Long userId) { this.userId = userId; } + + public Set> getConditions() { + return conditions; + } } From c8ebd8f9178780faf58109bf9ed8c418dec4d30b Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Thu, 7 May 2020 08:48:57 +0200 Subject: [PATCH 020/176] WIP on error fixing for sonarqube code smells and vulnerabilities check --- build.gradle | 3 +- gradle.properties | 4 + .../config/EmailConfigurationService.java | 32 +-- .../config/RuntimeTypeAdapterFactory.java | 6 +- .../controller/AuthenticationController.java | 10 +- .../InputDeviceConnectionController.java | 34 ++- .../controller/KnobDimmerController.java | 9 +- .../smarthut/controller/SwitchController.java | 1 - .../controller/ThermostatController.java | 3 +- .../controller/UserAccountController.java | 13 +- .../sanmarinoes/smarthut/dto/OkResponse.java | 6 - .../smarthut/dto/UserResponse.java | 12 + .../smarthut/error/UnauthorizedException.java | 4 +- .../smarthut/models/ConfirmationToken.java | 6 +- .../sanmarinoes/smarthut/models/Sensor.java | 6 +- .../smarthut/models/Thermostat.java | 2 - .../sa4/sanmarinoes/smarthut/models/User.java | 21 +- .../service/DevicePopulationService.java | 20 ++ .../service/DevicePropagationService.java | 141 +++++++++++ .../smarthut/service/DeviceService.java | 227 ++++++------------ .../smarthut/service/SceneService.java | 11 +- .../smarthut/service/ThermostatService.java | 2 +- .../smarthut/socket/SensorSocketEndpoint.java | 12 +- .../smarthut/AuthenticationTests.java | 9 +- .../sanmarinoes/smarthut/SmartHutTest.java | 5 +- 25 files changed, 354 insertions(+), 245 deletions(-) create mode 100644 gradle.properties delete mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/OkResponse.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java diff --git a/build.gradle b/build.gradle index c55c8c1..52470bf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'org.springframework.boot' version '2.2.4.RELEASE' id 'io.spring.dependency-management' version '1.0.9.RELEASE' id "de.aaschmid.cpd" version "3.1" + id "org.sonarqube" version "2.7" id 'java' } group = 'ch.usi.inf.sa4.sanmarinoes' @@ -49,4 +50,4 @@ gradle.projectsEvaluated { test { useJUnitPlatform() -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5fc88e8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +systemProp.sonar.host.url=https://lab.si.usi.ch:9000 +systemProp.sonar.login=871fdfcb09345b1841f1730596ac32aacf3a86fb +systemProp.sonar.projectKey=SMASmarthutBackend +systemProp.sonar.scm.disabled=true diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationService.java index a26aeeb..a87d21f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationService.java @@ -46,67 +46,67 @@ public class EmailConfigurationService { @NotNull private String registrationRedirect; - public String getRegistrationSubject() { + public synchronized String getRegistrationSubject() { return registrationSubject; } - public void setRegistrationSubject(String registrationSubject) { + public synchronized void setRegistrationSubject(String registrationSubject) { this.registrationSubject = registrationSubject; } - public String getRegistration() { + public synchronized String getRegistration() { return registration; } - public void setRegistration(String registration) { + public synchronized void setRegistration(String registration) { this.registration = registration; } - public String getRegistrationPath() { + public synchronized String getRegistrationPath() { return registrationPath; } - public void setRegistrationPath(String registrationPath) { + public synchronized void setRegistrationPath(String registrationPath) { this.registrationPath = registrationPath; } - public String getResetPasswordSubject() { + public synchronized String getResetPasswordSubject() { return resetPasswordSubject; } - public void setResetPasswordSubject(String resetPasswordSubject) { + public synchronized void setResetPasswordSubject(String resetPasswordSubject) { this.resetPasswordSubject = resetPasswordSubject; } - public String getResetPassword() { + public synchronized String getResetPassword() { return resetPassword; } - public void setResetPassword(String resetPassword) { + public synchronized void setResetPassword(String resetPassword) { this.resetPassword = resetPassword; } - public String getResetPasswordPath() { + public synchronized String getResetPasswordPath() { return resetPasswordPath; } - public void setResetPasswordPath(String resetPasswordPath) { + public synchronized void setResetPasswordPath(String resetPasswordPath) { this.resetPasswordPath = resetPasswordPath; } - public String getResetPasswordRedirect() { + public synchronized String getResetPasswordRedirect() { return resetPasswordRedirect; } - public void setResetPasswordRedirect(String resetPasswordRedirect) { + public synchronized void setResetPasswordRedirect(String resetPasswordRedirect) { this.resetPasswordRedirect = resetPasswordRedirect; } - public String getRegistrationRedirect() { + public synchronized String getRegistrationRedirect() { return registrationRedirect; } - public void setRegistrationRedirect(String registrationRedirect) { + public synchronized void setRegistrationRedirect(String registrationRedirect) { this.registrationRedirect = registrationRedirect; } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java index e4a9107..dbe1331 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java @@ -233,9 +233,9 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { } final Map> labelToDelegate = - new LinkedHashMap>(); + new LinkedHashMap>(labelToSubtype.size()); final Map, TypeAdapter> subtypeToDelegate = - new LinkedHashMap, TypeAdapter>(); + new LinkedHashMap, TypeAdapter>(labelToSubtype.size()); for (Map.Entry> entry : labelToSubtype.entrySet()) { TypeAdapter delegate = gson.getDelegateAdapter(this, TypeToken.get(entry.getValue())); @@ -245,7 +245,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { return new TypeAdapter() { @Override - public R read(JsonReader in) throws IOException { + public R read(JsonReader in) { JsonElement jsonElement = Streams.parse(in); JsonElement labelJsonElement; if (maintainType) { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java index f806f01..7179130 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java @@ -6,16 +6,14 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UnauthorizedException; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UserNotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; +import ch.usi.inf.sa4.sanmarinoes.smarthut.service.JWTUserDetailsService; import java.security.Principal; import javax.validation.Valid; - -import ch.usi.inf.sa4.sanmarinoes.smarthut.service.JWTUserDetailsService; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.DisabledException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.web.bind.annotation.*; @RestController @@ -30,8 +28,6 @@ public class AuthenticationController { private final JWTUserDetailsService userDetailsService; - private BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); - public AuthenticationController( AuthenticationManager authenticationManager, UserRepository userRepository, @@ -82,9 +78,9 @@ public class AuthenticationController { authenticationManager.authenticate( new UsernamePasswordAuthenticationToken(username, password)); } catch (DisabledException e) { - throw new UnauthorizedException(true); + throw new UnauthorizedException(true, e); } catch (BadCredentialsException e) { - throw new UnauthorizedException(false); + throw new UnauthorizedException(false, e); } } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java index 51ea46e..575d196 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java @@ -33,6 +33,22 @@ public abstract class InputDeviceConnectionController< this.input = input; this.outputs = outputs; } + + public I getInput() { + return input; + } + + public List getOutputs() { + return outputs; + } + } + + protected DeviceRepository getInputRepository() { + return inputRepository; + } + + protected DeviceRepository getOutputReposiory() { + return outputReposiory; } @Autowired private DeviceService deviceService; @@ -65,7 +81,7 @@ public abstract class InputDeviceConnectionController< inputRepository .findByIdAndUsername(inputId, username) .orElseThrow(() -> new NotFoundException("input device")); - final List outputDevices = new ArrayList<>(); + final List outputDevices = new ArrayList<>(outputs.size()); for (final Long outputId : outputs) { outputDevices.add( outputReposiory @@ -87,12 +103,12 @@ public abstract class InputDeviceConnectionController< Long inputId, List outputs, String username) throws NotFoundException { final Connection pair = checkConnectionIDs(inputId, outputs, username); - for (final O o : pair.outputs) { - connector.connect(pair.input, o, true); + for (final O o : pair.getOutputs()) { + connector.connect(pair.getInput(), o, true); } - deviceService.saveAllAsOwner(pair.outputs, username); - return pair.input.getOutputs(); + deviceService.saveAllAsOwner(pair.getOutputs(), username); + return pair.getInput().getOutputs(); } /** @@ -107,12 +123,12 @@ public abstract class InputDeviceConnectionController< Long inputId, List outputs, String username) throws NotFoundException { final Connection pair = checkConnectionIDs(inputId, outputs, username); - for (final O o : pair.outputs) { - connector.connect(pair.input, o, false); + for (final O o : pair.getOutputs()) { + connector.connect(pair.getInput(), o, false); } - deviceService.saveAllAsOwner(pair.outputs, username); - return pair.input.getOutputs(); + deviceService.saveAllAsOwner(pair.getOutputs(), username); + return pair.getInput().getOutputs(); } @PostMapping("/{id}/lights") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java index 1af7a99..f0900e4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java @@ -17,14 +17,17 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/knobDimmer") public class KnobDimmerController extends InputDeviceConnectionController { - @Autowired private DeviceService deviceService; - @Autowired private KnobDimmerRepository knobDimmerRepository; + private final DeviceService deviceService; + private final KnobDimmerRepository knobDimmerRepository; @Autowired protected KnobDimmerController( - KnobDimmerRepository inputRepository, DimmableRepository outputRepository) { + KnobDimmerRepository inputRepository, + DimmableRepository outputRepository, + DeviceService deviceService) { super(inputRepository, outputRepository, Dimmable.KNOB_DIMMER_DIMMABLE_CONNECTOR); this.knobDimmerRepository = inputRepository; + this.deviceService = deviceService; } @GetMapping("/{id}") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java index d92cd49..96f5a52 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*; public class SwitchController extends InputDeviceConnectionController { private SwitchRepository switchRepository; - private SwitchableRepository switchableRepository; private DeviceService deviceService; /** diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index f56d792..49c31f2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -36,8 +36,7 @@ public class ThermostatController { newT = thermostatRepository.save(newT); newT.setOn(t.isTurnOn()); - newT = deviceService.saveAsOwner(newT, principal.getName()); - return newT; + return deviceService.saveAsOwner(newT, principal.getName()); } @PostMapping diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java index 950fb1a..2432a13 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java @@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.EmailConfigurationService; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.InitPasswordResetRequest; -import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.OkResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.PasswordResetRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateRegistrationException; @@ -78,7 +77,7 @@ public class UserAccountController { * @throws DuplicateRegistrationException if a user exists with same email or username */ @PostMapping - public OkResponse registerUser(@Valid @RequestBody UserRegistrationRequest registrationData) + public void registerUser(@Valid @RequestBody UserRegistrationRequest registrationData) throws DuplicateRegistrationException { final User existingEmailUser = userRepository.findByEmailIgnoreCase(registrationData.getEmail()); @@ -112,8 +111,6 @@ public class UserAccountController { confirmationTokenRepository.save(token); sendEmail(toSave.getEmail(), token, true); - - return new OkResponse(); } } @@ -125,7 +122,7 @@ public class UserAccountController { * @throws UserNotFoundException if given email does not belong to any user */ @PostMapping("/init-reset-password") - public OkResponse initResetPassword(@Valid @RequestBody InitPasswordResetRequest resetRequest) + public void initResetPassword(@Valid @RequestBody InitPasswordResetRequest resetRequest) throws UserNotFoundException { final User toReset = userRepository.findByEmailIgnoreCase(resetRequest.getEmail()); @@ -148,8 +145,6 @@ public class UserAccountController { confirmationTokenRepository.save(token); sendEmail(toReset.getEmail(), token, false); - - return new OkResponse(); } /** @@ -160,7 +155,7 @@ public class UserAccountController { * @throws EmailTokenNotFoundException if given token is not a valid token for password reset */ @PutMapping("/reset-password") - public OkResponse resetPassword( + public void resetPassword( @Valid @RequestBody PasswordResetRequest resetRequest, final HttpServletResponse response) throws EmailTokenNotFoundException, IOException { @@ -178,8 +173,6 @@ public class UserAccountController { // Delete token to prevent further password changes confirmationTokenRepository.delete(token); - - return new OkResponse(); } /** diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/OkResponse.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/OkResponse.java deleted file mode 100644 index e3de94e..0000000 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/OkResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; - -/** A dummy DTO to return when there is no data to return */ -public class OkResponse { - private boolean success = true; -} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java index 2ed2c09..86314a0 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java @@ -16,4 +16,16 @@ public class UserResponse { us.username = u.getUsername(); return us; } + + public Long getId() { + return id; + } + + public String getUsername() { + return username; + } + + public String getName() { + return name; + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/UnauthorizedException.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/UnauthorizedException.java index 9176df6..53b8620 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/UnauthorizedException.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/UnauthorizedException.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; public class UnauthorizedException extends Exception { private final boolean isUserDisabled; - public UnauthorizedException(boolean isDisabled) { - super("Access denied: " + (isDisabled ? "user is disabled" : "wrong credentials")); + public UnauthorizedException(boolean isDisabled, Throwable cause) { + super("Access denied: " + (isDisabled ? "user is disabled" : "wrong credentials"), cause); this.isUserDisabled = isDisabled; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java index d324724..ac1f151 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java @@ -32,7 +32,7 @@ public class ConfirmationToken { private User user; @Column(nullable = false) - private Boolean resetPassword; + private boolean resetPassword; public ConfirmationToken(User user) { this.user = user; @@ -76,11 +76,11 @@ public class ConfirmationToken { this.user = user; } - public Boolean getResetPassword() { + public boolean getResetPassword() { return resetPassword; } - public void setResetPassword(Boolean resetPassword) { + public void setResetPassword(boolean resetPassword) { this.resetPassword = resetPassword; } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java index 2fb5442..0124016 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java @@ -15,9 +15,9 @@ public class Sensor extends InputDevice implements RangeTriggerable { public static final Map TYPICAL_VALUES = Map.of( - SensorType.TEMPERATURE, new BigDecimal(17.0), - SensorType.HUMIDITY, new BigDecimal(40.0), - SensorType.LIGHT, new BigDecimal(1000)); + SensorType.TEMPERATURE, BigDecimal.valueOf(17.0), + SensorType.HUMIDITY, BigDecimal.valueOf(40.0), + SensorType.LIGHT, BigDecimal.valueOf(1000)); @Override public double readTriggerState() { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java index 632dfd7..b6caf72 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java @@ -6,11 +6,9 @@ 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 diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java index b58e383..61bdf6d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java @@ -56,7 +56,7 @@ public class User { @Column(nullable = false) @GsonExclude - private Boolean isEnabled = false; + private boolean isEnabled = false; public Long getId() { return id; @@ -98,11 +98,11 @@ public class User { this.password = password; } - public Boolean getEnabled() { + public boolean getEnabled() { return isEnabled; } - public void setEnabled(Boolean enabled) { + public void setEnabled(boolean enabled) { isEnabled = enabled; } @@ -162,16 +162,17 @@ public class User { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; User user = (User) o; - return id.equals(user.id) - && name.equals(user.name) - && username.equals(user.username) - && password.equals(user.password) - && email.equals(user.email) - && isEnabled.equals(user.isEnabled); + return cameraEnabled == user.cameraEnabled + && isEnabled == user.isEnabled + && Objects.equals(id, user.id) + && Objects.equals(name, user.name) + && Objects.equals(username, user.username) + && Objects.equals(password, user.password) + && Objects.equals(email, user.email); } @Override public int hashCode() { - return Objects.hash(id, name, username, password, email, isEnabled); + return Objects.hash(id, name, username, password, email, isEnabled, cameraEnabled); } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java new file mode 100644 index 0000000..4d3d490 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java @@ -0,0 +1,20 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.service; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class DevicePopulationService { + + @Autowired private ThermostatService thermostatService; + + public void populateComputedFields(Iterable devices) { + for (Device d : devices) { + if (d instanceof Thermostat) { + thermostatService.populateMeasuredTemperature((Thermostat) d); + } + } + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java new file mode 100644 index 0000000..8df15ea --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java @@ -0,0 +1,141 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.service; + +import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; +import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint; +import java.util.List; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class DevicePropagationService { + + @Autowired private SensorSocketEndpoint endpoint; + @Autowired private EagerUserRepository userRepository; + @Autowired private DeviceRepository deviceRepository; + + void propagateUpdateAsGuest(Device device, User host, User guest) { + final Set guests = Set.copyOf(host.getGuests()); + + // We're telling the host that a guest has modified a device. Therefore, fromGuest becomes + // true. + // broadcast device update to host + endpoint.queueDeviceUpdate(device, host, true, null, false); + + // We're telling all guests that a higher entity has issued a device update. Therefore, + // fromHost becomes true. + for (final User aGuest : guests) { + if (aGuest.equals(guest)) { + continue; + } + // enqueue all device updates for all other guests + endpoint.queueDeviceUpdate(device, aGuest, false, host.getId(), false); + } + } + + void saveAllAsGuestSceneApplication(List devices, String guestUsername, Long hostId) { + final User guest = userRepository.findByUsername(guestUsername); + final User host = userRepository.findById(hostId).orElseThrow(IllegalStateException::new); + deviceRepository.saveAll(devices); + devices.forEach(d -> this.propagateUpdateAsGuest(d, host, guest)); + } + + void renameIfDuplicate(Device toCreate, String username) { + while (deviceRepository.findDuplicates(toCreate.getName(), username) + - (toCreate.getId() <= 0 ? 0 : 1) + > 0) { + toCreate.setName(toCreate.getName() + " (new)"); + } + } + + public T saveAsGuest(T device, String guestUsername, Long hostId) + throws NotFoundException { + final User currentUser = userRepository.findByUsername(guestUsername); + final User host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); + if (!host.getGuests().contains(currentUser)) throw new NotFoundException(); + renameIfDuplicate(device, host.getUsername()); + + device = deviceRepository.save(device); + propagateUpdateAsGuest(device, host, currentUser); + return device; + } + + /** + * Saves all the devices given in devices assuming that the owner updated them in one way or + * another. Takes care of the appropriate websocket updates and trigger checking as well. No + * checking is done to verify that the user whose username is given is in fact the owner of + * these devices + * + * @param devices the list of devices to save + * @param username the username of the owner of these devices + * @param fromScene true if the update comes from the a scene application side effect. Disables + * trigger checking to avoid recursive invocations of automations + * @param fromTrigger true if the update comes from a scene application executed by an + * automation. Propagates updated through socket to owner as well. No effect if fromScene is + * false. + * @param the type of device contained in the list + * @return the updated list of devices, ready to be fed to GSON + */ + public List saveAllAsOwner( + Iterable devices, String username, boolean fromScene, boolean fromTrigger) { + devices.forEach(d -> renameIfDuplicate(d, username)); + devices = deviceRepository.saveAll(devices); + devices.forEach((d) -> propagateUpdateAsOwner(d, username, fromScene && fromTrigger)); + + return toList(devices); + } + + public List saveAllAsOwner(Iterable devices, String username) { + return saveAllAsOwner(devices, username, false, false); + } + + public T saveAsOwner(T device, String username) { + renameIfDuplicate(device, username); + device = deviceRepository.save(device); + propagateUpdateAsOwner(device, username, false); + + return device; + } + + public void deleteByIdAsOwner(Long id, String username) throws NotFoundException { + Device d = + deviceRepository + .findByIdAndUsername(id, username) + .orElseThrow(NotFoundException::new); + + final User user = userRepository.findByUsername(username); + final Set guests = user.getGuests(); + // make sure we're broadcasting from host + for (final User guest : guests) { + // broadcast to endpoint the object device, with receiving user set to guest + endpoint.queueDeviceUpdate(d, guest, false, user.getId(), true); + } + + deviceRepository.delete(d); + } + + /** + * Propagates the update through the socket assuming that the user that modified the device is + * the owner of that device + * + * @param device the updated device + * @param username the username of the owner of that device + * @param causedByTrigger if true, send the update to the owner as well + */ + private void propagateUpdateAsOwner(Device device, String username, boolean causedByTrigger) { + final User user = userRepository.findByUsername(username); + final Set guests = user.getGuests(); + // make sure we're broadcasting from host + for (final User guest : guests) { + // broadcast to endpoint the object device, with receiving user set to guest + endpoint.queueDeviceUpdate(device, guest, false, user.getId(), false); + } + + if (causedByTrigger) { + endpoint.queueDeviceUpdate(device, user, false, user.getId(), false); + } + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index d2b02a6..b1a9c9e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -4,11 +4,9 @@ import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; -import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint; import java.util.Collection; import java.util.Comparator; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.springframework.beans.factory.annotation.Autowired; @@ -17,28 +15,42 @@ import org.springframework.stereotype.Component; @Component public class DeviceService { - @Autowired private DeviceRepository deviceRepository; - @Autowired private AutomationRepository automationRepository; - @Autowired private SceneRepository sceneRepository; - @Autowired private SceneService sceneService; - @Autowired private TriggerRepository> triggerRepository; - @Autowired private RoomRepository roomRepository; - @Autowired private EagerUserRepository userRepository; - @Autowired private SensorSocketEndpoint endpoint; - @Autowired private ThermostatService thermostatService; + private final DeviceRepository deviceRepository; + private final AutomationRepository automationRepository; + private final SceneRepository sceneRepository; + private final SceneService sceneService; + private final TriggerRepository> triggerRepository; + private final RoomRepository roomRepository; + private final EagerUserRepository userRepository; + private final DevicePopulationService devicePopulationService; + private final DevicePropagationService devicePropagationService; + + @Autowired + public DeviceService( + DeviceRepository deviceRepository, + AutomationRepository automationRepository, + SceneRepository sceneRepository, + SceneService sceneService, + TriggerRepository> triggerRepository, + RoomRepository roomRepository, + EagerUserRepository userRepository, + DevicePopulationService devicePopulationService, + DevicePropagationService devicePropagationService) { + this.deviceRepository = deviceRepository; + this.automationRepository = automationRepository; + this.sceneRepository = sceneRepository; + this.sceneService = sceneService; + this.triggerRepository = triggerRepository; + this.roomRepository = roomRepository; + this.userRepository = userRepository; + this.devicePopulationService = devicePopulationService; + this.devicePropagationService = devicePropagationService; + } public void throwIfRoomNotOwned(Long roomId, String username) throws NotFoundException { roomRepository.findByIdAndUsername(roomId, username).orElseThrow(NotFoundException::new); } - private void renameIfDuplicate(Device toCreate, String username) { - while (deviceRepository.findDuplicates(toCreate.getName(), username) - - (toCreate.getId() <= 0 ? 0 : 1) - > 0) { - toCreate.setName(toCreate.getName() + " (new)"); - } - } - private void triggerTriggers(Device device, final String username) { final long deviceId = device.getId(); @@ -66,122 +78,24 @@ public class DeviceService { return findAll(null, hostId, username); } - public List findAll(Long roomId, Long hostId, String username) - throws NotFoundException { - try { - Iterable devices; - User host = null; - if (hostId == null) { - if (roomId != null) { - roomRepository - .findByIdAndUsername(roomId, username) - .orElseThrow(NotFoundException::new); - devices = deviceRepository.findByRoomId(roomId); - } else { - devices = deviceRepository.findAllByUsername(username); - } - } else { - final User guest = userRepository.findByUsername(username); - host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); - - if (!guest.getHosts().contains(host)) { - throw new NotFoundException(); - } - - if (roomId != null) { - Room r = roomRepository.findById(roomId).orElseThrow(NotFoundException::new); - if (!r.getUserId().equals(hostId)) { - throw new NotFoundException(); - } - devices = deviceRepository.findByRoomId(roomId); - } else { - devices = deviceRepository.findAllByUsername(host.getUsername()); - } - } - - populateComputedFields(devices); - - if (host != null && !host.isCameraEnabled()) { - return StreamSupport.stream(devices.spliterator(), true) - .filter(d -> !(d instanceof SecurityCamera)) - .collect(Collectors.toList()); - } else { - return toList(devices); - } - } catch (NotFoundException e) { - e.printStackTrace(); - throw e; - } - } - - public void populateComputedFields(Iterable devices) { - for (Device d : devices) { - if (d instanceof Thermostat) { - thermostatService.populateMeasuredTemperature((Thermostat) d); - } - } - } - public T saveAsGuest(T device, String guestUsername, Long hostId) throws NotFoundException { final User currentUser = userRepository.findByUsername(guestUsername); final User host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); if (!host.getGuests().contains(currentUser)) throw new NotFoundException(); - renameIfDuplicate(device, host.getUsername()); + devicePropagationService.renameIfDuplicate(device, host.getUsername()); device = deviceRepository.save(device); - propagateUpdateAsGuest(device, host, currentUser); + devicePropagationService.propagateUpdateAsGuest(device, host, currentUser); return device; } - private void propagateUpdateAsGuest(Device device, User host, User guest) { - final Set guests = Set.copyOf(host.getGuests()); - - // We're telling the host that a guest has modified a device. Therefore, fromGuest becomes - // true. - // broadcast device update to host - endpoint.queueDeviceUpdate(device, host, true, null, false); - - // We're telling all guests that a higher entity has issued a device update. Therefore, - // fromHost becomes true. - for (final User aGuest : guests) { - if (aGuest.equals(guest)) { - continue; - } - // enqueue all device updates for all other guests - endpoint.queueDeviceUpdate(device, aGuest, false, host.getId(), false); - } + public void deleteByIdAsOwner(Long id, String username) throws NotFoundException { + devicePropagationService.deleteByIdAsOwner(id, username); } - List saveAllAsGuestSceneApplication( - List devices, String guestUsername, Long hostId) { - final User guest = userRepository.findByUsername(guestUsername); - final User host = userRepository.findById(hostId).orElseThrow(IllegalStateException::new); - deviceRepository.saveAll(devices); - devices.forEach(d -> this.propagateUpdateAsGuest(d, host, guest)); - return devices; - } - - /** - * Propagates the update through the socket assuming that the user that modified the device is - * the owner of that device - * - * @param device the updated device - * @param username the username of the owner of that device - * @param causedByTrigger if true, send the update to the owner as well - */ - private void propagateUpdateAsOwner(Device device, String username, boolean causedByTrigger) { - final User user = userRepository.findByUsername(username); - final Set guests = user.getGuests(); - // make sure we're broadcasting from host - for (final User guest : guests) { - // broadcast to endpoint the object device, with receiving user set to guest - endpoint.queueDeviceUpdate(device, guest, false, user.getId(), false); - } - - if (causedByTrigger) { - endpoint.queueDeviceUpdate(device, user, false, user.getId(), false); - } + public void populateComputedFields(Iterable devices) { + devicePopulationService.populateComputedFields(devices); } /** @@ -202,15 +116,12 @@ public class DeviceService { */ public List saveAllAsOwner( Iterable devices, String username, boolean fromScene, boolean fromTrigger) { - devices.forEach(d -> renameIfDuplicate(d, username)); - devices = deviceRepository.saveAll(devices); - devices.forEach((d) -> propagateUpdateAsOwner(d, username, fromScene && fromTrigger)); - + List toReturn = + devicePropagationService.saveAllAsOwner(devices, username, fromScene, fromTrigger); if (!fromScene) { - devices.forEach((d) -> triggerTriggers(d, username)); + toReturn.forEach((d) -> this.triggerTriggers(d, username)); } - - return toList(devices); + return toReturn; } public List saveAllAsOwner(Iterable devices, String username) { @@ -218,29 +129,51 @@ public class DeviceService { } public T saveAsOwner(T device, String username) { - renameIfDuplicate(device, username); - device = deviceRepository.save(device); - propagateUpdateAsOwner(device, username, false); - - triggerTriggers(device, username); - + T toReturn = devicePropagationService.saveAsOwner(device, username); + triggerTriggers(toReturn, username); return device; } - public void deleteByIdAsOwner(Long id, String username) throws NotFoundException { - Device d = - deviceRepository - .findByIdAndUsername(id, username) + public List findAll(Long roomId, Long hostId, String username) + throws NotFoundException { + Iterable devices; + User host = null; + if (hostId == null) { + if (roomId != null) { + roomRepository + .findByIdAndUsername(roomId, username) .orElseThrow(NotFoundException::new); + devices = deviceRepository.findByRoomId(roomId); + } else { + devices = deviceRepository.findAllByUsername(username); + } + } else { + final User guest = userRepository.findByUsername(username); + host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); - final User user = userRepository.findByUsername(username); - final Set guests = user.getGuests(); - // make sure we're broadcasting from host - for (final User guest : guests) { - // broadcast to endpoint the object device, with receiving user set to guest - endpoint.queueDeviceUpdate(d, guest, false, user.getId(), true); + if (!guest.getHosts().contains(host)) { + throw new NotFoundException(); + } + + if (roomId != null) { + Room r = roomRepository.findById(roomId).orElseThrow(NotFoundException::new); + if (!r.getUserId().equals(hostId)) { + throw new NotFoundException(); + } + devices = deviceRepository.findByRoomId(roomId); + } else { + devices = deviceRepository.findAllByUsername(host.getUsername()); + } } - deviceRepository.delete(d); + devicePopulationService.populateComputedFields(devices); + + if (host != null && !host.isCameraEnabled()) { + return StreamSupport.stream(devices.spliterator(), true) + .filter(d -> !(d instanceof SecurityCamera)) + .collect(Collectors.toList()); + } else { + return toList(devices); + } } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 3c91277..71bf6d1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -10,30 +10,31 @@ import org.springframework.stereotype.Component; public class SceneService { @Autowired private DeviceRepository deviceRepository; - @Autowired private DeviceService deviceService; + @Autowired private DevicePopulationService devicePopulationService; + @Autowired private DevicePropagationService devicePropagationService; @Autowired private StateRepository> stateRepository; private List copyStatesToDevices(Scene fromScene) { - final List updated = new ArrayList<>(); + final List updated = new ArrayList<>(fromScene.getStates().size()); for (final State s : fromScene.getStates()) { s.apply(); updated.add(s.getDevice()); } - deviceService.populateComputedFields(updated); + devicePopulationService.populateComputedFields(updated); return updated; } public List apply(Scene newScene, String username, boolean fromTrigger) { List updated = copyStatesToDevices(newScene); - deviceService.saveAllAsOwner(updated, username, true, fromTrigger); + devicePropagationService.saveAllAsOwner(updated, username, true, fromTrigger); return updated; } public List applyAsGuest(Scene newScene, String username, Long hostId) { List updated = copyStatesToDevices(newScene); - deviceService.saveAllAsGuestSceneApplication(updated, username, hostId); + devicePropagationService.saveAllAsGuestSceneApplication(updated, username, hostId); return updated; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java index 328d092..5cdee37 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java @@ -16,7 +16,7 @@ public class ThermostatService { @Autowired private SensorSocketEndpoint endpoint; - @Autowired private DeviceService deviceService; + @Autowired private DevicePropagationService deviceService; @Autowired private ThermostatRepository thermostatRepository; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java index 4764f18..5cb3110 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java @@ -5,7 +5,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.JWTTokenUtils; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository; -import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; +import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DevicePopulationService; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; @@ -20,15 +20,15 @@ import org.springframework.stereotype.Component; @Component public class SensorSocketEndpoint extends Endpoint { - private Gson gson = GsonConfig.socketGson(); + private final Gson gson = GsonConfig.socketGson(); - @Autowired private DeviceService deviceService; + @Autowired private DevicePopulationService deviceService; - private UserRepository userRepository; + private final UserRepository userRepository; - private JWTTokenUtils jwtTokenUtils; + private final JWTTokenUtils jwtTokenUtils; - private Multimap authorizedClients = + private final Multimap authorizedClients = Multimaps.synchronizedMultimap(HashMultimap.create()); // messages are now stored as strings as a "hack" to capture and clone the state of the device, diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java index d13104f..5eac647 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTResponse; -import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.OkResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateRegistrationException; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UnauthorizedException; @@ -42,9 +41,9 @@ public class AuthenticationTests extends SmartHutTest { @Override protected void setUp() { - final ResponseEntity res = + final ResponseEntity res = this.restTemplate.postForEntity( - this.url("/register"), getDisabledUser(), OkResponse.class); + this.url("/register"), getDisabledUser(), Object.class); assertThat(res.getStatusCode().equals(HttpStatus.OK)); registerTestUser(restTemplate, userRepository, tokenRepository); @@ -178,8 +177,8 @@ public class AuthenticationTests extends SmartHutTest { request.setEmail("smarthut.sm@example.com"); request.setPassword("password"); - final ResponseEntity res = - this.restTemplate.postForEntity(url("/register"), request, OkResponse.class); + final ResponseEntity res = + this.restTemplate.postForEntity(url("/register"), request, Object.class); assertThat(res.getStatusCode().equals(HttpStatus.OK)); assertThat(res.getBody() != null); } diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java index f2b737a..69a7ba1 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java @@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut; import static org.assertj.core.api.Assertions.assertThat; -import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.OkResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationToken; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationTokenRepository; @@ -40,8 +39,8 @@ public abstract class SmartHutTest { final TestRestTemplate restTemplate, final UserRepository userRepository, final ConfirmationTokenRepository tokenRepository) { - final ResponseEntity res2 = - restTemplate.postForEntity(this.url("/register"), enabledUser, OkResponse.class); + final ResponseEntity res2 = + restTemplate.postForEntity(this.url("/register"), enabledUser, Object.class); assertThat(res2.getStatusCode().equals(HttpStatus.OK)); final User persistedEnabledUser = userRepository.findByUsername("enabled"); From 028983072d7a9009f0248ecd26703af88ab0d239 Mon Sep 17 00:00:00 2001 From: Luca Ponzanelli Date: Thu, 7 May 2020 13:39:08 +0200 Subject: [PATCH 021/176] Resolve "Setup SonarQube pipeline for development branch" - Remove de.aaschmid.cpd, and sonarqube v2.7 gradle plugins - Add sonarqube and jacopo gradle plugins - Remove code_quality job and add sonarqube job in code_quality stage - Limit sonarqube analysis to dev branch only --- .gitlab-ci.yml | 14 +++++--------- build.gradle | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 309580e..06efd58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,14 +52,10 @@ test: reports: junit: build/test-results/test/TEST-*.xml -#Runs a quality check on the code and creates a report on the codes -code_quality: +sonarqube: + image: gradle:jdk11 stage: code_quality - allow_failure: true + only: + - dev script: - - gradle cpdCheck - artifacts: - paths: - - build/reports/cpd/cpdCheck.xml - #create a report on the quality of the code - expose_as: 'Code Quality Report' + - gradle build jacocoTestReport sonarqube -Dsonar.verbose=true -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN -Dsonar.projectKey=$CI_PROJECT_ PATH_SLUG -Dsonar.projectName=$CI_PROJECT_PATH_SLUG -Dsonar.scm.disabled=True -Dsonar.coverage.jacoco.xmlReportPaths=./build/reports/jacoco/test/jacocoTestReport.xml diff --git a/build.gradle b/build.gradle index 52470bf..4f04b96 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { id 'org.springframework.boot' version '2.2.4.RELEASE' id 'io.spring.dependency-management' version '1.0.9.RELEASE' - id "de.aaschmid.cpd" version "3.1" - id "org.sonarqube" version "2.7" id 'java' + id 'jacoco' + id "org.sonarqube" version "2.8" } group = 'ch.usi.inf.sa4.sanmarinoes' version = '0.0.1-SNAPSHOT' @@ -51,3 +51,13 @@ gradle.projectsEvaluated { test { useJUnitPlatform() } + +jacocoTestReport { + reports { + xml.enabled true + } +} + +plugins.withType(JacocoPlugin) { + tasks["test"].finalizedBy 'jacocoTestReport' +} From 317ddb5445cda8c498cb21aafa3e4064da8768ce Mon Sep 17 00:00:00 2001 From: Luca Ponzanelli Date: Thu, 7 May 2020 13:49:32 +0200 Subject: [PATCH 022/176] Issue #73: fix CI_PROJECT_PATH_SLUG env variable name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06efd58..61edc46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,4 +58,4 @@ sonarqube: only: - dev script: - - gradle build jacocoTestReport sonarqube -Dsonar.verbose=true -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN -Dsonar.projectKey=$CI_PROJECT_ PATH_SLUG -Dsonar.projectName=$CI_PROJECT_PATH_SLUG -Dsonar.scm.disabled=True -Dsonar.coverage.jacoco.xmlReportPaths=./build/reports/jacoco/test/jacocoTestReport.xml + - gradle build jacocoTestReport sonarqube -Dsonar.verbose=true -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN -Dsonar.projectKey=$CI_PROJECT_PATH_SLUG -Dsonar.projectName=$CI_PROJECT_PATH_SLUG -Dsonar.scm.disabled=True -Dsonar.coverage.jacoco.xmlReportPaths=./build/reports/jacoco/test/jacocoTestReport.xml From 1f5f948e237c282be840a52e7d7dbb141efa7ab1 Mon Sep 17 00:00:00 2001 From: omenem Date: Thu, 7 May 2020 16:38:45 +0200 Subject: [PATCH 023/176] wip --- .../smarthut/models/BooleanCondition.java | 7 ++- .../smarthut/models/Condition.java | 4 +- .../smarthut/models/RangeCondition.java | 20 ++++++- .../smarthut/models/ThermostatCondition.java | 54 +++++++++++++++++++ 4 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java index 0957ce1..5b3f1e3 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java @@ -4,7 +4,7 @@ import javax.persistence.Column; import javax.persistence.Entity; @Entity -public class BooleanCondition +public class BooleanCondition extends Condition { // TODO add interface to type constraints @Column(name = "switchable_on") @@ -25,4 +25,9 @@ public class BooleanCondition public boolean check(boolean on) { return this.on == on; } + + @Override + public boolean triggered() { + return this.getDevice().readTriggerState() == isOn(); + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java index 9366e90..e643f24 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java @@ -13,7 +13,7 @@ import javax.persistence.Transient; import javax.validation.constraints.NotNull; @Entity -public class Condition { +public abstract class Condition { @Transient private String kind; @@ -67,6 +67,8 @@ public class Condition { @NotNull private Long automationId; + public abstract boolean triggered(); + public long getId() { return id; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java index 8283245..6047235 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java @@ -7,7 +7,7 @@ import javax.persistence.Entity; import javax.validation.constraints.NotNull; @Entity -public class RangeCondition extends Condition { +public class RangeCondition extends Condition { protected RangeCondition(String kind) { super(kind); @@ -49,4 +49,22 @@ public class RangeCondition extends Condition { public void setRange(Double range) { this.range = range; } + + @Override + public boolean triggered() { + double value = getDevice().readTriggerState(); + switch (operator) { + case EQUAL: + return value == range; + case LESS: + return value < range; + case GREATER: + return value > range; + case GREATER_EQUAL: + return value >= range; + case LESS_EQUAL: + return value <= range; + } + throw new IllegalStateException(); + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java new file mode 100644 index 0000000..439f32d --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java @@ -0,0 +1,54 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import com.google.gson.annotations.SerializedName; +import javax.persistence.Column; +import javax.persistence.Entity; + +@Entity +public class ThermostatCondition extends Condition { + + protected ThermostatCondition(String kind) { + super(kind); + } + + public enum Operator { + @SerializedName("EQUAL") + EQUAL, + @SerializedName("NOTEQUAL") + NOTEQUAL, + } + + @Column(nullable = false) + private ThermostatCondition.Operator operator; + + @Column(nullable = false) + private Thermostat.Mode mode; + + public Operator getOperator() { + return operator; + } + + public void setOperator(Operator operator) { + this.operator = operator; + } + + public Thermostat.Mode getState() { + return mode; + } + + public void setState(Thermostat.Mode state) { + this.mode = state; + } + + @Override + public boolean triggered() { + switch (operator) { + case EQUAL: + return getDevice().getMode() == mode; + case NOTEQUAL: + return getDevice().getMode() != mode; + default: + return false; + } + } +} From 1bde4344bea93a088241556ba525d5663a2b2496 Mon Sep 17 00:00:00 2001 From: omenem Date: Thu, 7 May 2020 18:12:55 +0200 Subject: [PATCH 024/176] Added controllers repos and dtos --- .../BooleanConditionController.java | 61 ++++++++++++++++++ .../controller/RangeConditionController.java | 62 +++++++++++++++++++ .../ThermostatConditionController.java | 62 +++++++++++++++++++ .../dto/BooleanConditionSaveRequest.java | 42 +++++++++++++ .../dto/RangeConditionSaveRequest.java | 54 ++++++++++++++++ .../dto/ThermostatConditionSaveRequest.java | 56 +++++++++++++++++ .../models/BooleanConditionRepository.java | 10 +++ .../smarthut/models/Condition.java | 12 ---- .../smarthut/models/ConditionRepository.java | 10 +++ .../smarthut/models/RangeCondition.java | 10 +-- .../models/RangeConditionRepository.java | 10 +++ .../smarthut/models/ThermostatCondition.java | 10 +-- .../models/ThermostatConditionRepository.java | 9 +++ 13 files changed, 386 insertions(+), 22 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionRepository.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java new file mode 100644 index 0000000..fac99b5 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java @@ -0,0 +1,61 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.controller; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanConditionSaveRequest; +import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanConditionRepository; +import java.util.List; +import javax.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@EnableAutoConfiguration +@RequestMapping("/booleanCondition") +public class BooleanConditionController { + + @Autowired BooleanConditionRepository booleanConditionRepository; + + @GetMapping("/{automationId}") + public List> getAll(@PathVariable long automationId) { + return booleanConditionRepository.findAllByAutomationId(automationId); + } + + private BooleanCondition save(BooleanCondition newRL, BooleanConditionSaveRequest s) { + newRL.setDeviceId(s.getDeviceId()); + newRL.setAutomationId(s.getAutomationId()); + newRL.setOn(s.isOn()); + + return booleanConditionRepository.save(newRL); + } + + @PostMapping + public BooleanCondition create( + @Valid @RequestBody BooleanConditionSaveRequest booleanTriggerSaveRequest) { + return save(new BooleanCondition<>(), booleanTriggerSaveRequest); + } + + @PutMapping + public BooleanCondition update( + @Valid @RequestBody BooleanConditionSaveRequest booleanTriggerSaveRequest) + throws NotFoundException { + return save( + booleanConditionRepository + .findById(booleanTriggerSaveRequest.getId()) + .orElseThrow(NotFoundException::new), + booleanTriggerSaveRequest); + } + + @DeleteMapping("/{id}") + public void delete(@PathVariable long id) { + booleanConditionRepository.deleteById(id); + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java new file mode 100644 index 0000000..25491b0 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java @@ -0,0 +1,62 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.controller; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeConditionSaveRequest; +import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeConditionRepository; +import java.util.List; +import javax.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@EnableAutoConfiguration +@RequestMapping("/rangeCondition") +public class RangeConditionController { + + @Autowired RangeConditionRepository rangeConditionRepository; + + @GetMapping("/{automationId}") + public List> getAll(@PathVariable long automationId) { + return rangeConditionRepository.findAllByAutomationId(automationId); + } + + private RangeCondition save(RangeCondition newRL, RangeConditionSaveRequest s) { + newRL.setDeviceId(s.getDeviceId()); + newRL.setAutomationId(s.getAutomationId()); + newRL.setOperator(s.getOperator()); + newRL.setRange(s.getRange()); + + return rangeConditionRepository.save(newRL); + } + + @PostMapping + public RangeCondition create( + @Valid @RequestBody RangeConditionSaveRequest booleanTriggerSaveRequest) { + return save(new RangeCondition<>(), booleanTriggerSaveRequest); + } + + @PutMapping + public RangeCondition update( + @Valid @RequestBody RangeConditionSaveRequest booleanTriggerSaveRequest) + throws NotFoundException { + return save( + rangeConditionRepository + .findById(booleanTriggerSaveRequest.getId()) + .orElseThrow(NotFoundException::new), + booleanTriggerSaveRequest); + } + + @DeleteMapping("/{id}") + public void delete(@PathVariable long id) { + rangeConditionRepository.deleteById(id); + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java new file mode 100644 index 0000000..a6d118a --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java @@ -0,0 +1,62 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.controller; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatConditionSaveRequest; +import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatConditionRepository; +import java.util.List; +import javax.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@EnableAutoConfiguration +@RequestMapping("/thermostatCondition") +public class ThermostatConditionController { + + @Autowired ThermostatConditionRepository thermostatConditionRepository; + + @GetMapping("/{automationId}") + public List getAll(@PathVariable long automationId) { + return thermostatConditionRepository.findAllByAutomationId(automationId); + } + + private ThermostatCondition save(ThermostatCondition newRL, ThermostatConditionSaveRequest s) { + newRL.setDeviceId(s.getDeviceId()); + newRL.setAutomationId(s.getAutomationId()); + newRL.setOperator(s.getOperator()); + newRL.setMode(s.getMode()); + + return thermostatConditionRepository.save(newRL); + } + + @PostMapping + public ThermostatCondition create( + @Valid @RequestBody ThermostatConditionSaveRequest booleanTriggerSaveRequest) { + return save(new ThermostatCondition(), booleanTriggerSaveRequest); + } + + @PutMapping + public ThermostatCondition update( + @Valid @RequestBody ThermostatConditionSaveRequest booleanTriggerSaveRequest) + throws NotFoundException { + return save( + thermostatConditionRepository + .findById(booleanTriggerSaveRequest.getId()) + .orElseThrow(NotFoundException::new), + booleanTriggerSaveRequest); + } + + @DeleteMapping("/{id}") + public void delete(@PathVariable long id) { + thermostatConditionRepository.deleteById(id); + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java new file mode 100644 index 0000000..2abf6e0 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java @@ -0,0 +1,42 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; + +import javax.validation.constraints.NotNull; + +public class BooleanConditionSaveRequest { + + @NotNull private long id; + + @NotNull private Long deviceId; + + @NotNull private Long automationId; + + @NotNull private boolean on; + + public long getId() { + return id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public Long getAutomationId() { + return automationId; + } + + public void setAutomationId(Long automationId) { + this.automationId = automationId; + } + + public boolean isOn() { + return on; + } + + public void setOn(boolean on) { + this.on = on; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java new file mode 100644 index 0000000..8cf4bf6 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java @@ -0,0 +1,54 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition.Operator; +import javax.validation.constraints.NotNull; + +public class RangeConditionSaveRequest { + + @NotNull private long id; + + @NotNull private Long deviceId; + + @NotNull private Long automationId; + + @NotNull private RangeCondition.Operator operator; + + @NotNull private double range; + + public long getId() { + return id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public Long getAutomationId() { + return automationId; + } + + public void setAutomationId(Long automationId) { + this.automationId = automationId; + } + + public Operator getOperator() { + return operator; + } + + public void setOperator(Operator operator) { + this.operator = operator; + } + + public double getRange() { + return range; + } + + public void setRange(double range) { + this.range = range; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java new file mode 100644 index 0000000..8c56f2d --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java @@ -0,0 +1,56 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat.Mode; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition.Operator; +import javax.validation.constraints.NotNull; + +public class ThermostatConditionSaveRequest { + + @NotNull private long id; + + @NotNull private Long deviceId; + + @NotNull private Long automationId; + + @NotNull private ThermostatCondition.Operator operator; + + @NotNull private Thermostat.Mode mode; + + public long getId() { + return id; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + public Long getAutomationId() { + return automationId; + } + + public void setAutomationId(Long automationId) { + this.automationId = automationId; + } + + public Operator getOperator() { + return operator; + } + + public void setOperator(Operator operator) { + this.operator = operator; + } + + public Mode getMode() { + return mode; + } + + public void setMode(Mode mode) { + this.mode = mode; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java new file mode 100644 index 0000000..c564c41 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java @@ -0,0 +1,10 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import java.util.List; +import org.springframework.data.repository.query.Param; + +public interface BooleanConditionRepository + extends ConditionRepository> { + + List> findAllByAutomationId(@Param("automationId") long automationId); +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java index e643f24..be917b8 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java @@ -41,10 +41,6 @@ public abstract class Condition { @GsonExclude private Long userId; - @NotNull - @Column(nullable = false) - private String name; - @ManyToOne(targetEntity = Device.class) @JoinColumn(name = "device_id", updatable = false, insertable = false) @GsonExclude @@ -93,14 +89,6 @@ public abstract class Condition { this.userId = userId; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - public D getDevice() { return device; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java new file mode 100644 index 0000000..346dfd5 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java @@ -0,0 +1,10 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import java.util.List; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; + +public interface ConditionRepository> extends CrudRepository { + + List findAllByDeviceId(@Param("deviceId") long deviceId); +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java index 6047235..7ad1a8d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java @@ -9,8 +9,8 @@ import javax.validation.constraints.NotNull; @Entity public class RangeCondition extends Condition { - protected RangeCondition(String kind) { - super(kind); + public RangeCondition() { + super("booleanCondition"); } public enum Operator { @@ -28,17 +28,17 @@ public class RangeCondition extends Conditi @NotNull @Column(nullable = false) - private RangeTrigger.Operator operator; + private RangeCondition.Operator operator; @NotNull @Column(nullable = false) private double range; - public RangeTrigger.Operator getOperator() { + public RangeCondition.Operator getOperator() { return operator; } - public void setOperator(RangeTrigger.Operator operator) { + public void setOperator(RangeCondition.Operator operator) { this.operator = operator; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java new file mode 100644 index 0000000..1ed6aa3 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java @@ -0,0 +1,10 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import java.util.List; +import org.springframework.data.repository.query.Param; + +public interface RangeConditionRepository + extends ConditionRepository> { + + List> findAllByAutomationId(@Param("automationId") long automationId); +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java index 439f32d..2bb65d1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java @@ -7,8 +7,8 @@ import javax.persistence.Entity; @Entity public class ThermostatCondition extends Condition { - protected ThermostatCondition(String kind) { - super(kind); + public ThermostatCondition() { + super("thermostatCondition"); } public enum Operator { @@ -32,12 +32,12 @@ public class ThermostatCondition extends Condition { this.operator = operator; } - public Thermostat.Mode getState() { + public Thermostat.Mode getMode() { return mode; } - public void setState(Thermostat.Mode state) { - this.mode = state; + public void setMode(Thermostat.Mode mode) { + this.mode = mode; } @Override diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionRepository.java new file mode 100644 index 0000000..4b529fb --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionRepository.java @@ -0,0 +1,9 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +import java.util.List; +import org.springframework.data.repository.query.Param; + +public interface ThermostatConditionRepository extends ConditionRepository { + + List findAllByAutomationId(@Param("automationId") long automationId); +} From 09c08580caa261eec23372b7674060261c3950e7 Mon Sep 17 00:00:00 2001 From: omenem Date: Thu, 7 May 2020 19:01:35 +0200 Subject: [PATCH 025/176] Everything should be implemented --- .../smarthut/models/ConditionRepository.java | 2 + .../smarthut/service/DeviceService.java | 77 +++++++++++++++++-- 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java index 346dfd5..cb6c1c4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java @@ -7,4 +7,6 @@ import org.springframework.data.repository.query.Param; public interface ConditionRepository> extends CrudRepository { List findAllByDeviceId(@Param("deviceId") long deviceId); + + List findAllByAutomationId(@Param("automationId") long automationId); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index d2b02a6..f25c72f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -5,6 +5,7 @@ import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint; +import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.List; @@ -22,6 +23,7 @@ public class DeviceService { @Autowired private SceneRepository sceneRepository; @Autowired private SceneService sceneService; @Autowired private TriggerRepository> triggerRepository; + @Autowired private ConditionRepository> conditionRepository; @Autowired private RoomRepository roomRepository; @Autowired private EagerUserRepository userRepository; @Autowired private SensorSocketEndpoint endpoint; @@ -43,12 +45,75 @@ public class DeviceService { final long deviceId = device.getId(); + // find the conditions that this device state change is triggering + List> triggeredConditions = + conditionRepository + .findAllByDeviceId(deviceId) + .stream() + .filter(Condition::triggered) + .collect(Collectors.toList()); + + List automationsWithMetConditions = new ArrayList<>(); + + // this condition is connected to an automation obviously, and this automation might be + // connected to many other conditions, I need to find them all and make sure all of them are + // in their "TRUE" state. + // if that's the case I need to remember that this automation needs to be triggered + for (Condition condition : triggeredConditions) { + + Automation a = + automationRepository + .findById(condition.getAutomationId()) + .orElseThrow(IllegalStateException::new); + List> conditions = + conditionRepository.findAllByAutomationId(a.getId()); + + if (conditions.size() + == conditions + .stream() + .filter(Condition::triggered) + .collect(Collectors.toList()) + .size()) { + automationsWithMetConditions.add(a); + } + } + List> triggers = triggerRepository.findAllByDeviceId(deviceId); - triggers.stream() - .filter(Trigger::triggered) - .map(Trigger::getAutomationId) - .map(t -> automationRepository.findById(t).orElseThrow(IllegalStateException::new)) + // these are all the automations that are triggered, now I need to check if they are + // associated + // with some conditions, if they are I need to check that they are present also in the + // automationsToTrigger list. + // there are two cases: + // 1. this automation has been triggered and it is not connected to any condition, therefore + // this can be kept in the list + // 2. this automation has been triggered, it is connected to one or more conditions, but it + // is not present in the automationsToTrigger list, therefore it has to be discarded + List triggeredAutomationsTMP = + triggers.stream() + .filter(Trigger::triggered) + .map(Trigger::getAutomationId) + .map( + t -> + automationRepository + .findById(t) + .orElseThrow(IllegalStateException::new)) + .distinct() + .collect(Collectors.toList()); + + List triggeredAutomations = new ArrayList<>(); + for (Automation a : triggeredAutomationsTMP) { + if (conditionRepository.findAllByAutomationId(a.getId()).size() > 0) { + if (automationsWithMetConditions.contains(a)) { + triggeredAutomations.add(a); + } + } else { + triggeredAutomations.add(a); + } + } + + triggeredAutomations + .stream() .distinct() .map(Automation::getScenes) .flatMap(Collection::stream) @@ -126,7 +191,9 @@ public class DeviceService { throws NotFoundException { final User currentUser = userRepository.findByUsername(guestUsername); final User host = userRepository.findById(hostId).orElseThrow(NotFoundException::new); - if (!host.getGuests().contains(currentUser)) throw new NotFoundException(); + if (!host.getGuests().contains(currentUser)) { + throw new NotFoundException(); + } renameIfDuplicate(device, host.getUsername()); device = deviceRepository.save(device); From c9f53f0c970ca6b1b7205a62865c74c2cf571070 Mon Sep 17 00:00:00 2001 From: britea Date: Fri, 8 May 2020 09:59:42 +0200 Subject: [PATCH 026/176] fix thermostat --- .../smarthut/controller/ThermostatController.java | 6 ++++++ .../sanmarinoes/smarthut/models/ThermostatRepository.java | 4 ++-- .../sa4/sanmarinoes/smarthut/service/ThermostatService.java | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 49c31f2..099061a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -36,7 +36,13 @@ public class ThermostatController { newT = thermostatRepository.save(newT); newT.setOn(t.isTurnOn()); +<<<<<<< Updated upstream return deviceService.saveAsOwner(newT, principal.getName()); +======= + newT = deviceService.saveAsOwner(newT, principal.getName()); + System.out.println(newT); + return newT; +>>>>>>> Stashed changes } @PostMapping diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java index 896e0ad..290ebf5 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java @@ -25,6 +25,6 @@ public interface ThermostatRepository extends DeviceRepository { * @return an optional big decimal, empty if none found */ @Query( - "SELECT AVG(s.value) FROM Sensor s JOIN s.room r WHERE s.sensor = 'TEMPERATURE' AND r.id = ?1") - Optional getAverageTemperature(Long thermostatRoomId); + "SELECT AVG(s.value) FROM Sensor s JOIN s.room r WHERE s.sensor = ?2 AND r.id = ?1") + Optional getAverageTemperature(Long thermostatRoomId, Sensor.SensorType sensorType); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java index 5cdee37..100d77d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java @@ -77,7 +77,8 @@ public class ThermostatService { Optional average; if (thermostat.isUseExternalSensors()) { - average = thermostatRepository.getAverageTemperature(thermostat.getRoomId()); + average = thermostatRepository.getAverageTemperature(thermostat.getRoomId(), Sensor.SensorType.TEMPERATURE); + } else { return thermostat.getInternalSensorTemperature(); } From 501b9219b91689dba6325dcff12c6fa46b69154d Mon Sep 17 00:00:00 2001 From: britea Date: Fri, 8 May 2020 10:03:31 +0200 Subject: [PATCH 027/176] resolve conflict --- .../smarthut/controller/ThermostatController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 099061a..49c31f2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -36,13 +36,7 @@ public class ThermostatController { newT = thermostatRepository.save(newT); newT.setOn(t.isTurnOn()); -<<<<<<< Updated upstream return deviceService.saveAsOwner(newT, principal.getName()); -======= - newT = deviceService.saveAsOwner(newT, principal.getName()); - System.out.println(newT); - return newT; ->>>>>>> Stashed changes } @PostMapping From b72f527b0de4023225ca31e7e48e5d1cc8f5ccd0 Mon Sep 17 00:00:00 2001 From: omenem Date: Fri, 8 May 2020 17:44:30 +0200 Subject: [PATCH 028/176] Added conditions in PUT automation/fast --- .../controller/AutomationController.java | 12 ++++ .../dto/AutomationFastUpdateRequest.java | 63 +++++++++++++++++++ .../smarthut/models/Condition.java | 29 +-------- .../smarthut/models/ConditionRepository.java | 4 ++ 4 files changed, 81 insertions(+), 27 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java index cfad787..19d828a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java @@ -28,6 +28,7 @@ public class AutomationController { @Autowired private AutomationRepository automationRepository; @Autowired private ScenePriorityRepository sceneRepository; @Autowired private TriggerRepository> triggerRepository; + @Autowired private ConditionRepository> conditionRepository; @Autowired private UserRepository userService; @GetMapping @@ -87,6 +88,7 @@ public class AutomationController { triggerRepository.deleteAllByAutomationId(a.getId()); sceneRepository.deleteAllByAutomationId(a.getId()); + conditionRepository.deleteAllByAutomationId(a.getId()); Iterable> tt = triggerRepository.saveAll( @@ -103,10 +105,20 @@ public class AutomationController { .map(t -> t.setAutomationId(a.getId())) .collect(Collectors.toList())); + Iterable> cc = + conditionRepository.saveAll( + req.getConditions() + .stream() + .map(AutomationFastUpdateRequest.ConditionDTO::toModel) + .map(t -> t.setAutomationId(a.getId())) + .collect(Collectors.toList())); + a.getScenes().clear(); a.getTriggers().clear(); + a.getConditions().clear(); ss.forEach(t -> a.getScenes().add(t)); tt.forEach(t -> a.getTriggers().add(t)); + cc.forEach(t -> a.getConditions().add(t)); return a; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java index 58ce46c..61ced2a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java @@ -1,8 +1,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger; import java.util.List; import javax.validation.constraints.Min; @@ -57,8 +62,58 @@ public class AutomationFastUpdateRequest { } } + public abstract class ConditionDTO { + @NotNull public long deviceId; + + public abstract Condition toModel(); + } + + public class BooleanConditionDTO extends ConditionDTO { + + @NotNull public boolean on; + + @Override + public Condition toModel() { + BooleanCondition t = new BooleanCondition<>(); + t.setDeviceId(this.deviceId); + t.setOn(this.on); + return t; + } + } + + public class RangeConditionDTO extends ConditionDTO { + + @NotNull RangeCondition.Operator operator; + @NotNull double range; + + @Override + public Condition toModel() { + RangeCondition t = new RangeCondition<>(); + t.setDeviceId(this.deviceId); + t.setOperator(this.operator); + t.setRange(this.range); + return t; + } + } + + public class ThermostatConditionDTO extends ConditionDTO { + + @NotNull ThermostatCondition.Operator operator; + @NotNull private Thermostat.Mode mode; + + @Override + public Condition toModel() { + ThermostatCondition t = new ThermostatCondition(); + t.setDeviceId(this.deviceId); + t.setOperator(this.operator); + t.setMode(this.mode); + return t; + } + } + @NotNull private List scenes; @NotNull private List triggers; + @NotNull private List conditions; @NotNull private long id; @NotNull @NotEmpty private String name; @@ -94,4 +149,12 @@ public class AutomationFastUpdateRequest { public void setId(long id) { this.id = id; } + + public List getConditions() { + return conditions; + } + + public void setConditions(List conditions) { + this.conditions = conditions; + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java index be917b8..859730b 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java @@ -31,16 +31,6 @@ public abstract class Condition { @ApiModelProperty(hidden = true) private long id; - @ManyToOne - @JoinColumn(name = "user_id", updatable = false, insertable = false) - @GsonExclude - private User user; - - @NotNull - @Column(name = "user_id", nullable = false) - @GsonExclude - private Long userId; - @ManyToOne(targetEntity = Device.class) @JoinColumn(name = "device_id", updatable = false, insertable = false) @GsonExclude @@ -73,22 +63,6 @@ public abstract class Condition { this.id = id; } - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - public D getDevice() { return device; } @@ -117,7 +91,8 @@ public abstract class Condition { return automationId; } - public void setAutomationId(Long automationId) { + public Condition setAutomationId(Long automationId) { this.automationId = automationId; + return this; } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java index cb6c1c4..2f7a1cc 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionRepository.java @@ -1,6 +1,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import java.util.List; +import javax.transaction.Transactional; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; @@ -9,4 +10,7 @@ public interface ConditionRepository> extends CrudReposit List findAllByDeviceId(@Param("deviceId") long deviceId); List findAllByAutomationId(@Param("automationId") long automationId); + + @Transactional + void deleteAllByAutomationId(@Param("automationId") long automationId); } From 628edfd76f1cd97c0627edac1e76a35cb0ad0dd2 Mon Sep 17 00:00:00 2001 From: omenem Date: Fri, 8 May 2020 17:50:59 +0200 Subject: [PATCH 029/176] edited GSONConfig --- .../smarthut/config/GsonConfig.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java index 4b69a07..d3c0c50 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java @@ -1,6 +1,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.config; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState; @@ -43,12 +44,32 @@ public class GsonConfig { .registerSubtype( AutomationFastUpdateRequest.RangeTriggerDTO.class, "rangeTrigger"); + + RuntimeTypeAdapterFactory + runtimeTypeAdapterFactoryIII = + RuntimeTypeAdapterFactory.of( + AutomationFastUpdateRequest.ConditionDTO.class, "kind") + .registerSubtype( + AutomationFastUpdateRequest.BooleanConditionDTO.class, + "booleanCondition") + .registerSubtype( + AutomationFastUpdateRequest.RangeConditionDTO.class, + "rangeCondition") + .registerSubtype( + AutomationFastUpdateRequest.ThermostatConditionDTO.class, + "thermostatCondition"); + builder.registerTypeAdapterFactory(runtimeTypeAdapterFactory); builder.registerTypeAdapterFactory(runtimeTypeAdapterFactoryII); + builder.registerTypeAdapterFactory(runtimeTypeAdapterFactoryIII); builder.registerTypeAdapter( Trigger.class, (JsonSerializer>) (src, typeOfSrc, context) -> context.serialize((Object) src)); + builder.registerTypeAdapter( + Condition.class, + (JsonSerializer>) + (src, typeOfSrc, context) -> context.serialize((Object) src)); return builder; } From a61e43a01459aea2063dc231bb5d9ce3d7bebdbf Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Fri, 8 May 2020 23:18:18 +0200 Subject: [PATCH 030/176] Sonarqube fixes --- .../smarthut/controller/CurtainsController.java | 4 ++-- .../smarthut/controller/DeviceController.java | 10 ++++++---- .../smarthut/controller/DimmableLightController.java | 4 ++-- .../smarthut/controller/RegularLightController.java | 4 ++-- .../smarthut/controller/SmartPlugController.java | 4 ++-- .../smarthut/controller/ThermostatController.java | 4 ++-- .../inf/sa4/sanmarinoes/smarthut/models/Device.java | 3 --- .../sa4/sanmarinoes/smarthut/models/RangeTrigger.java | 1 - .../inf/sa4/sanmarinoes/smarthut/models/Sensor.java | 2 -- .../inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java | 2 -- .../sa4/sanmarinoes/smarthut/models/Thermostat.java | 2 +- .../inf/sa4/sanmarinoes/smarthut/models/Trigger.java | 1 - .../sanmarinoes/smarthut/service/DeviceService.java | 10 ++++++---- 13 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java index 4065f12..9fbf704 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java @@ -64,8 +64,8 @@ public class CurtainsController { .findByIdAndUsername(deviceId, principal.getName()) .orElseThrow(NotFoundException::new); State s = c.cloneState(); - sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); - s.setSceneId(sceneId); + final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); + s.setSceneId(sc.getId()); if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0) throw new DuplicateStateException(); return stateRepository.save(s); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceController.java index b53b0af..1221043 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceController.java @@ -5,6 +5,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.error.BadDataException; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RoomRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; import java.security.Principal; @@ -40,11 +41,12 @@ public class DeviceController { .orElseThrow(NotFoundException::new); // check if roomId is valid - roomRepository - .findByIdAndUsername(deviceSaveRequest.getRoomId(), principal.getName()) - .orElseThrow(() -> new BadDataException("roomId is not a valid room id")); + final Room r = + roomRepository + .findByIdAndUsername(deviceSaveRequest.getRoomId(), principal.getName()) + .orElseThrow(() -> new BadDataException("roomId is not a valid room id")); - d.setRoomId(deviceSaveRequest.getRoomId()); + d.setRoomId(r.getId()); d.setName(deviceSaveRequest.getName()); deviceService.saveAsOwner(d, principal.getName()); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java index 28648c1..e315ff1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java @@ -98,8 +98,8 @@ public class DimmableLightController extends GuestEnabledController s = d.cloneState(); - sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); - s.setSceneId(sceneId); + final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); + s.setSceneId(sc.getId()); if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0) throw new DuplicateStateException(); return stateRepository.save(s); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java index 145aa04..3768cb4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java @@ -110,8 +110,8 @@ public class RegularLightController extends GuestEnabledController .findByIdAndUsername(deviceId, principal.getName()) .orElseThrow(NotFoundException::new); State s = d.cloneState(); - sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); - s.setSceneId(sceneId); + final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); + s.setSceneId(sc.getId()); if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0) throw new DuplicateStateException(); return stateRepository.save(s); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java index 790aee2..88a78f6 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java @@ -78,8 +78,8 @@ public class SmartPlugController { .findByIdAndUsername(deviceId, principal.getName()) .orElseThrow(NotFoundException::new); State s = d.cloneState(); - sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); - s.setSceneId(sceneId); + final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); + s.setSceneId(sc.getId()); if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0) throw new DuplicateStateException(); return stateRepository.save(s); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 49c31f2..8ab96f5 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -75,8 +75,8 @@ public class ThermostatController { .findByIdAndUsername(deviceId, principal.getName()) .orElseThrow(NotFoundException::new); State s = d.cloneState(); - sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); - s.setSceneId(sceneId); + final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); + s.setSceneId(sc.getId()); if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0) throw new DuplicateStateException(); return stateRepository.save(s); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java index d2231d8..aa88d09 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.HashSet; import java.util.Set; import javax.persistence.*; -import javax.validation.constraints.NotNull; /** Generic abstraction for a smart home device */ @Entity @@ -46,11 +45,9 @@ public abstract class Device { * a REST call. */ @Column(name = "room_id", nullable = false) - @NotNull private Long roomId; /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */ - @NotNull @Column(nullable = false) private String name; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java index 19e179c..5fdc119 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java @@ -43,7 +43,6 @@ public class RangeTrigger extends Trigger { * from a REST call. */ @Column(name = "device_id", nullable = false) - @NotNull private Long deviceId; @ManyToOne diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index b1a9c9e..bf16b88 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -48,7 +48,11 @@ public class DeviceService { } public void throwIfRoomNotOwned(Long roomId, String username) throws NotFoundException { - roomRepository.findByIdAndUsername(roomId, username).orElseThrow(NotFoundException::new); + final Room r = + roomRepository + .findByIdAndUsername(roomId, username) + .orElseThrow(NotFoundException::new); + if (!r.getId().equals(roomId)) throw new IllegalStateException(); } private void triggerTriggers(Device device, final String username) { @@ -140,9 +144,7 @@ public class DeviceService { User host = null; if (hostId == null) { if (roomId != null) { - roomRepository - .findByIdAndUsername(roomId, username) - .orElseThrow(NotFoundException::new); + throwIfRoomNotOwned(roomId, username); devices = deviceRepository.findByRoomId(roomId); } else { devices = deviceRepository.findAllByUsername(username); From bd32a2aebb3a3093c44943cca1ff18f4e51eb648 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 9 May 2020 13:13:31 +0200 Subject: [PATCH 031/176] more Sonarqube fixes --- .../sanmarinoes/smarthut/config/JWTTokenUtils.java | 2 +- .../smarthut/controller/MotionSensorController.java | 2 -- .../controller/SecurityCameraController.java | 4 ++-- .../inf/sa4/sanmarinoes/smarthut/models/Device.java | 13 ++++++++++--- .../sanmarinoes/smarthut/models/RangeTrigger.java | 2 -- .../sa4/sanmarinoes/smarthut/models/Trigger.java | 2 -- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java index f6943a8..9d2d939 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; @Component public class JWTTokenUtils { /** The duration in seconds of the validity of a single token */ - private static final long JWT_TOKEN_VALIDITY = 5 * 60 * 60; + private static final long JWT_TOKEN_VALIDITY = (long) 5 * 60 * 60; /** The secret key used to encrypt all JWTs */ @Value("${jwt.secret}") diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java index 6fcd7ca..660387a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java @@ -6,7 +6,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensorRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.MotionSensorService; -import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint; import java.security.Principal; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +20,6 @@ public class MotionSensorController { @Autowired private DeviceService deviceService; @Autowired private MotionSensorService motionSensorService; @Autowired private MotionSensorRepository motionSensorRepository; - @Autowired private SensorSocketEndpoint sensorSocketEndpoint; @PostMapping public MotionSensor create( diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java index 1554f0a..1bbc750 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java @@ -76,8 +76,8 @@ public class SecurityCameraController { .findByIdAndUsername(deviceId, principal.getName()) .orElseThrow(NotFoundException::new); State s = d.cloneState(); - sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); - s.setSceneId(sceneId); + final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new); + s.setSceneId(sc.getId()); if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0) throw new DuplicateStateException(); return stateRepository.save(s); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java index aa88d09..be6f897 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java @@ -4,7 +4,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude; import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModelProperty; -import java.util.HashSet; import java.util.Set; import javax.persistence.*; @@ -13,6 +12,14 @@ import javax.persistence.*; @Inheritance(strategy = InheritanceType.JOINED) public abstract class Device { + public Set> getTriggers() { + return triggers; + } + + public Set> getStates() { + return states; + } + /** Ways a device can behave in the automation flow. For now only input/output */ public enum FlowType { @SerializedName("INPUT") @@ -38,7 +45,7 @@ public abstract class Device { @OneToMany(mappedBy = "device", orphanRemoval = true) @GsonExclude @SocketGsonExclude - private Set> triggers = new HashSet<>(); + private Set> triggers; /** * The room this device belongs in, as a foreign key id. To use when updating and inserting from @@ -66,7 +73,7 @@ public abstract class Device { @OneToMany(mappedBy = "device", orphanRemoval = true) @GsonExclude @SocketGsonExclude - private Set> states = new HashSet<>(); + private Set> states; @Transient @GsonExclude private Long fromHostId = null; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java index 5fdc119..c4d5836 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java @@ -3,7 +3,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import com.google.gson.annotations.SerializedName; import javax.persistence.Column; import javax.persistence.Entity; -import javax.validation.constraints.NotNull; @Entity public class RangeTrigger extends Trigger { @@ -46,7 +45,6 @@ public class RangeTrigger extends Trigger { private Automation automation; @Column(name = "automation_id", nullable = false) - @NotNull private Long automationId; public long getId() { From ba02475c832b254fd148e57ebf10d3ff33da53f6 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 9 May 2020 13:18:33 +0200 Subject: [PATCH 032/176] Fixed very severe security vulnerability (Use logger instead of System.out in SensorSocketEndpoint) --- .../sanmarinoes/smarthut/socket/SensorSocketEndpoint.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java index 5cb3110..cec40f2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java @@ -13,6 +13,8 @@ import com.google.gson.Gson; import java.io.IOException; import java.util.*; import javax.websocket.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -20,6 +22,8 @@ import org.springframework.stereotype.Component; @Component public class SensorSocketEndpoint extends Endpoint { + private static final Logger logger = LoggerFactory.getLogger(SensorSocketEndpoint.class); + private final Gson gson = GsonConfig.socketGson(); @Autowired private DevicePopulationService deviceService; @@ -98,7 +102,7 @@ public class SensorSocketEndpoint extends Endpoint { authorizedClients.remove(u, s); } } catch (IOException e) { - e.printStackTrace(); + logger.warn(e.getLocalizedMessage(), e); } } } From 204f7bf423e499c1cd740cc65adc55f917392e36 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 9 May 2020 13:29:03 +0200 Subject: [PATCH 033/176] Even more Sonarqube fixes --- .../controller/DimmableLightController.java | 8 ++--- .../smarthut/controller/RoomController.java | 29 ++++++++++++++----- .../controller/SecurityCameraController.java | 20 +++++++++---- .../smarthut/controller/SensorController.java | 17 +++++++---- .../sanmarinoes/smarthut/models/Device.java | 8 +++++ 5 files changed, 60 insertions(+), 22 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java index e315ff1..ffd39fa 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java @@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/dimmableLight") public class DimmableLightController extends GuestEnabledController { - private DimmableLightRepository dimmableLightRepository; - private SceneRepository sceneRepository; - private StateRepository> stateRepository; - private DeviceService deviceService; + private final DimmableLightRepository dimmableLightRepository; + private final SceneRepository sceneRepository; + private final StateRepository> stateRepository; + private final DeviceService deviceService; @Autowired public DimmableLightController( diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java index 8b7f648..79b61d2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java @@ -6,7 +6,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RoomSaveRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; -import ch.usi.inf.sa4.sanmarinoes.smarthut.service.ThermostatService; import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils; import java.security.Principal; import java.util.*; @@ -20,19 +19,33 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/room") public class RoomController { - @Autowired private RoomRepository roomRepository; + private final RoomRepository roomRepository; - @Autowired private UserRepository userRepository; + private final UserRepository userRepository; - @Autowired private DeviceService deviceService; + private final DeviceService deviceService; - @Autowired private SwitchRepository switchRepository; + private final SwitchRepository switchRepository; - @Autowired private ButtonDimmerRepository buttonDimmerRepository; + private final ButtonDimmerRepository buttonDimmerRepository; - @Autowired private KnobDimmerRepository knobDimmerRepository; + private final KnobDimmerRepository knobDimmerRepository; - @Autowired private ThermostatService thermostatService; + @Autowired + public RoomController( + RoomRepository roomRepository, + UserRepository userRepository, + DeviceService deviceService, + SwitchRepository switchRepository, + ButtonDimmerRepository buttonDimmerRepository, + KnobDimmerRepository knobDimmerRepository) { + this.roomRepository = roomRepository; + this.userRepository = userRepository; + this.deviceService = deviceService; + this.switchRepository = switchRepository; + this.buttonDimmerRepository = buttonDimmerRepository; + this.knobDimmerRepository = knobDimmerRepository; + } private List fetchOwnerOrGuest( final List list, Long hostId, final Principal principal) throws NotFoundException { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java index 1bbc750..9716430 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java @@ -22,12 +22,22 @@ import org.springframework.web.bind.annotation.RestController; @EnableAutoConfiguration @RequestMapping("/securityCamera") public class SecurityCameraController { + private final DeviceService deviceService; + private final SecurityCameraRepository securityCameraService; + private final SceneRepository sceneRepository; + private final StateRepository> stateRepository; - @Autowired private DeviceService deviceService; - @Autowired private SecurityCameraRepository securityCameraService; - @Autowired private SceneRepository sceneRepository; - @Autowired private StateRepository> stateRepository; - @Autowired private RoomRepository roomRepository; + @Autowired + public SecurityCameraController( + DeviceService deviceService, + SecurityCameraRepository securityCameraService, + SceneRepository sceneRepository, + StateRepository> stateRepository) { + this.deviceService = deviceService; + this.securityCameraService = securityCameraService; + this.sceneRepository = sceneRepository; + this.stateRepository = stateRepository; + } private SecurityCamera save( SecurityCamera newSC, SwitchableSaveRequest sc, final Principal principal) { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java index 3833452..ff1677d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java @@ -5,7 +5,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.SensorService; -import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint; import java.math.BigDecimal; import java.security.Principal; import java.util.*; @@ -19,13 +18,21 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/sensor") public class SensorController { - @Autowired private DeviceService deviceService; + private final DeviceService deviceService; - @Autowired private SensorRepository sensorRepository; + private final SensorRepository sensorRepository; - @Autowired private SensorSocketEndpoint sensorSocketEndpoint; + private final SensorService sensorService; - @Autowired private SensorService sensorService; + @Autowired + public SensorController( + DeviceService deviceService, + SensorRepository sensorRepository, + SensorService sensorService) { + this.deviceService = deviceService; + this.sensorRepository = sensorRepository; + this.sensorService = sensorService; + } @PostMapping public Sensor create(@Valid @RequestBody SensorSaveRequest s, final Principal principal) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java index be6f897..3d6847f 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java @@ -75,6 +75,14 @@ public abstract class Device { @SocketGsonExclude private Set> states; + public String getKind() { + return kind; + } + + public FlowType getFlowType() { + return flowType; + } + @Transient @GsonExclude private Long fromHostId = null; @Transient @GsonExclude private boolean fromGuest = false; From 6e98972a5ba090b15c9bf2db26dfea826fe2e7f8 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 9 May 2020 13:42:17 +0200 Subject: [PATCH 034/176] Minor code style fixes and global formatter run --- .../controller/ScenePriorityController.java | 1 - .../sanmarinoes/smarthut/models/Connector.java | 1 - .../sanmarinoes/smarthut/models/Curtains.java | 4 ++-- .../smarthut/models/DimmableRepository.java | 3 +-- .../sa4/sanmarinoes/smarthut/models/Room.java | 3 +-- .../smarthut/models/ThermostatRepository.java | 3 +-- .../service/DevicePropagationService.java | 16 +++++++++++++--- .../smarthut/service/JWTUserDetailsService.java | 3 +-- .../smarthut/service/SceneService.java | 17 ++++++++++++----- .../smarthut/service/ThermostatService.java | 4 +++- 10 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java index 6e95f75..1449727 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java @@ -24,7 +24,6 @@ public class ScenePriorityController { @Autowired ScenePriorityRepository scenePriorityRepository; - @GetMapping("/{automationId}") public List getByAutomationId(@PathVariable long automationId) throws NotFoundException { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java index 701a010..325f0dd 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java @@ -1,7 +1,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import java.util.Set; -import java.util.function.BiConsumer; import java.util.function.Function; /** diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Curtains.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Curtains.java index d9e8d98..af2fd40 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Curtains.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Curtains.java @@ -3,8 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import javax.persistence.Entity; /** - * Represents a curtain. The intensity represents how much the curtains are opened, - * 0 is completely closed 100 is completely open + * Represents a curtain. The intensity represents how much the curtains are opened, 0 is completely + * closed 100 is completely open */ @Entity public class Curtains extends Dimmable { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableRepository.java index be791c9..dffbbdb 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableRepository.java @@ -1,4 +1,3 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; -public interface DimmableRepository extends SwitchableRepository { -} +public interface DimmableRepository extends SwitchableRepository {} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java index 73d7794..43b7e35 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java @@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import io.swagger.annotations.ApiModelProperty; -import java.util.HashSet; import java.util.Set; import javax.persistence.*; import javax.validation.constraints.NotNull; @@ -36,7 +35,7 @@ public class Room { @OneToMany(mappedBy = "room", orphanRemoval = true) @GsonExclude - private Set devices = new HashSet<>(); + private Set devices; /** * User that owns the house this room is in as a foreign key id. To use when updating and diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java index 290ebf5..768b882 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java @@ -24,7 +24,6 @@ public interface ThermostatRepository extends DeviceRepository { * @param thermostatRoomId room ID of the thermostat * @return an optional big decimal, empty if none found */ - @Query( - "SELECT AVG(s.value) FROM Sensor s JOIN s.room r WHERE s.sensor = ?2 AND r.id = ?1") + @Query("SELECT AVG(s.value) FROM Sensor s JOIN s.room r WHERE s.sensor = ?2 AND r.id = ?1") Optional getAverageTemperature(Long thermostatRoomId, Sensor.SensorType sensorType); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java index 8df15ea..ae004a4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java @@ -13,9 +13,19 @@ import org.springframework.stereotype.Component; @Component public class DevicePropagationService { - @Autowired private SensorSocketEndpoint endpoint; - @Autowired private EagerUserRepository userRepository; - @Autowired private DeviceRepository deviceRepository; + private final SensorSocketEndpoint endpoint; + private final EagerUserRepository userRepository; + private final DeviceRepository deviceRepository; + + @Autowired + public DevicePropagationService( + SensorSocketEndpoint endpoint, + EagerUserRepository userRepository, + DeviceRepository deviceRepository) { + this.endpoint = endpoint; + this.userRepository = userRepository; + this.deviceRepository = deviceRepository; + } void propagateUpdateAsGuest(Device device, User host, User guest) { final Set guests = Set.copyOf(host.getGuests()); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java index 7dff142..8ab5f8a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java @@ -1,9 +1,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.service; -import java.util.Set; - import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository; +import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.*; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 71bf6d1..0fcf1f8 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -3,16 +3,23 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.service; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import java.util.ArrayList; import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component public class SceneService { - @Autowired private DeviceRepository deviceRepository; - @Autowired private DevicePopulationService devicePopulationService; - @Autowired private DevicePropagationService devicePropagationService; - @Autowired private StateRepository> stateRepository; + private final DevicePopulationService devicePopulationService; + private final DevicePropagationService devicePropagationService; + private final StateRepository> stateRepository; + + public SceneService( + DevicePopulationService devicePopulationService, + DevicePropagationService devicePropagationService, + StateRepository> stateRepository) { + this.devicePopulationService = devicePopulationService; + this.devicePropagationService = devicePropagationService; + this.stateRepository = stateRepository; + } private List copyStatesToDevices(Scene fromScene) { final List updated = new ArrayList<>(fromScene.getStates().size()); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java index 100d77d..d11e76e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java @@ -77,7 +77,9 @@ public class ThermostatService { Optional average; if (thermostat.isUseExternalSensors()) { - average = thermostatRepository.getAverageTemperature(thermostat.getRoomId(), Sensor.SensorType.TEMPERATURE); + average = + thermostatRepository.getAverageTemperature( + thermostat.getRoomId(), Sensor.SensorType.TEMPERATURE); } else { return thermostat.getInternalSensorTemperature(); From 191870d3c6c6d870f76575393c3e12bd58caddc6 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 9 May 2020 14:05:43 +0200 Subject: [PATCH 035/176] More sonarqube fixes --- .../controller/ThermostatController.java | 4 +-- .../service/DevicePopulationService.java | 2 +- .../service/ThermostatPopulationService.java | 34 +++++++++++++++++++ .../smarthut/service/ThermostatService.java | 29 ++++------------ 4 files changed, 43 insertions(+), 26 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationService.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 8ab96f5..386e1ca 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -5,7 +5,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService; -import ch.usi.inf.sa4.sanmarinoes.smarthut.service.ThermostatService; +import ch.usi.inf.sa4.sanmarinoes.smarthut.service.ThermostatPopulationService; import java.security.Principal; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +19,7 @@ public class ThermostatController { @Autowired private DeviceService deviceService; @Autowired private ThermostatRepository thermostatRepository; - @Autowired private ThermostatService thermostatService; + @Autowired private ThermostatPopulationService thermostatService; @Autowired private SceneRepository sceneRepository; @Autowired private StateRepository> stateRepository; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java index 4d3d490..9b3e7d2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; @Component public class DevicePopulationService { - @Autowired private ThermostatService thermostatService; + @Autowired private ThermostatPopulationService thermostatService; public void populateComputedFields(Iterable devices) { for (Device d : devices) { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationService.java new file mode 100644 index 0000000..d8e1878 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationService.java @@ -0,0 +1,34 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.service; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat; +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository; +import java.math.BigDecimal; +import java.util.Optional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class ThermostatPopulationService { + + @Autowired private ThermostatRepository thermostatRepository; + + private BigDecimal measureTemperature(final Thermostat thermostat) { + Optional average; + + if (thermostat.isUseExternalSensors()) { + average = + thermostatRepository.getAverageTemperature( + thermostat.getRoomId(), Sensor.SensorType.TEMPERATURE); + + } else { + return thermostat.getInternalSensorTemperature(); + } + + return average.orElse(null); + } + + public void populateMeasuredTemperature(Thermostat thermostat) { + thermostat.setMeasuredTemperature(measureTemperature(thermostat)); + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java index d11e76e..5eeec6c 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java @@ -16,7 +16,9 @@ public class ThermostatService { @Autowired private SensorSocketEndpoint endpoint; - @Autowired private DevicePropagationService deviceService; + @Autowired private DeviceService deviceService; + + @Autowired private ThermostatPopulationService thermostatPopulationService; @Autowired private ThermostatRepository thermostatRepository; @@ -41,12 +43,12 @@ public class ThermostatService { public List findAll(String username) { Iterable all = thermostatRepository.findAllByUsername(username); - all.forEach(this::populateMeasuredTemperature); + all.forEach(thermostatPopulationService::populateMeasuredTemperature); return Utils.toList(all); } public void computeState(Thermostat t) { - populateMeasuredTemperature(t); + thermostatPopulationService.populateMeasuredTemperature(t); t.computeState(); } @@ -67,28 +69,9 @@ public class ThermostatService { if (t.isPresent()) { Thermostat u = t.get(); - populateMeasuredTemperature(u); + thermostatPopulationService.populateMeasuredTemperature(u); t = Optional.of(u); } return t; } - - private BigDecimal measureTemperature(final Thermostat thermostat) { - Optional average; - - if (thermostat.isUseExternalSensors()) { - average = - thermostatRepository.getAverageTemperature( - thermostat.getRoomId(), Sensor.SensorType.TEMPERATURE); - - } else { - return thermostat.getInternalSensorTemperature(); - } - - return average.orElse(null); - } - - public void populateMeasuredTemperature(Thermostat thermostat) { - thermostat.setMeasuredTemperature(measureTemperature(thermostat)); - } } From 15faf0a6b40a8ef5482e542b7e613ecf75e0dc90 Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sat, 9 May 2020 14:23:39 +0200 Subject: [PATCH 036/176] Fixed circular dependency on switch connector --- .../controller/ButtonDimmerController.java | 2 +- .../InputDeviceConnectionController.java | 18 +++----- .../controller/KnobDimmerController.java | 2 +- .../smarthut/controller/SwitchController.java | 6 +-- .../smarthut/models/Connectable.java | 5 ++ .../smarthut/models/Connector.java | 46 ------------------- .../sanmarinoes/smarthut/models/Dimmable.java | 6 --- .../sanmarinoes/smarthut/models/Dimmer.java | 12 ++++- .../sanmarinoes/smarthut/models/Switch.java | 12 ++++- .../smarthut/models/Switchable.java | 3 -- 10 files changed, 38 insertions(+), 74 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connectable.java delete mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java index cf2cb56..e2bc359 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java @@ -26,7 +26,7 @@ public class ButtonDimmerController ButtonDimmerRepository inputRepository, DimmableRepository outputRepository, DeviceService deviceService) { - super(inputRepository, outputRepository, DimmableLight.BUTTON_DIMMER_DIMMABLE_CONNECTOR); + super(inputRepository, outputRepository); this.deviceService = deviceService; this.buttonDimmerRepository = inputRepository; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java index 575d196..4b92125 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @param the output device attached to I */ public abstract class InputDeviceConnectionController< - I extends InputDevice, O extends OutputDevice> { + I extends InputDevice & Connectable, O extends OutputDevice> { private class Connection { private final I input; @@ -53,26 +53,20 @@ public abstract class InputDeviceConnectionController< @Autowired private DeviceService deviceService; - private DeviceRepository inputRepository; + private final DeviceRepository inputRepository; - private DeviceRepository outputReposiory; - - private Connector connector; + private final DeviceRepository outputReposiory; /** * Contstructs the controller by requiring essential object for the controller implementation * * @param inputRepository the input device repository * @param outputRepository the output device repository - * @param connector a appropriate Connector instance for the I and O tyoes. */ protected InputDeviceConnectionController( - DeviceRepository inputRepository, - DeviceRepository outputRepository, - Connector connector) { + DeviceRepository inputRepository, DeviceRepository outputRepository) { this.inputRepository = inputRepository; this.outputReposiory = outputRepository; - this.connector = connector; } private Connection checkConnectionIDs(Long inputId, List outputs, String username) @@ -104,7 +98,7 @@ public abstract class InputDeviceConnectionController< final Connection pair = checkConnectionIDs(inputId, outputs, username); for (final O o : pair.getOutputs()) { - connector.connect(pair.getInput(), o, true); + pair.getInput().connect(o, true); } deviceService.saveAllAsOwner(pair.getOutputs(), username); @@ -124,7 +118,7 @@ public abstract class InputDeviceConnectionController< final Connection pair = checkConnectionIDs(inputId, outputs, username); for (final O o : pair.getOutputs()) { - connector.connect(pair.getInput(), o, false); + pair.getInput().connect(o, false); } deviceService.saveAllAsOwner(pair.getOutputs(), username); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java index f0900e4..f80e1fd 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java @@ -25,7 +25,7 @@ public class KnobDimmerController extends InputDeviceConnectionController outputRepository, DeviceService deviceService) { - super(inputRepository, outputRepository, Dimmable.KNOB_DIMMER_DIMMABLE_CONNECTOR); + super(inputRepository, outputRepository); this.knobDimmerRepository = inputRepository; this.deviceService = deviceService; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java index 96f5a52..299c7e5 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/switch") public class SwitchController extends InputDeviceConnectionController { - private SwitchRepository switchRepository; - private DeviceService deviceService; + private final SwitchRepository switchRepository; + private final DeviceService deviceService; /** * Contstructs the controller by requiring essential object for the controller implementation @@ -31,7 +31,7 @@ public class SwitchController extends InputDeviceConnectionController outputRepository, DeviceService deviceService) { - super(inputRepository, outputRepository, Switchable.SWITCH_SWITCHABLE_CONNECTOR); + super(inputRepository, outputRepository); this.deviceService = deviceService; this.switchRepository = inputRepository; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connectable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connectable.java new file mode 100644 index 0000000..8423930 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connectable.java @@ -0,0 +1,5 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.models; + +public interface Connectable { + void connect(O output, boolean connect); +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java deleted file mode 100644 index 325f0dd..0000000 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java +++ /dev/null @@ -1,46 +0,0 @@ -package ch.usi.inf.sa4.sanmarinoes.smarthut.models; - -import java.util.Set; -import java.util.function.Function; - -/** - * A rule on how to connect an input device type to an output device type - * - * @param the input device type - * @param the output device type - */ -@FunctionalInterface -public interface Connector { - - /** - * Connects or disconnects input to output - * - * @param input the input device - * @param output the output device - * @param connect true if connection, false if disconnection - */ - void connect(I input, O output, boolean connect); - - /** - * Produces a basic implementation of a connector, assuming there is a ManyToMany relationship - * between J and K - * - * @param outputsGetter the getter method of the set of outputs on the input class - * @param inputsGetter the getter method of the set of outputs on the input class - * @param the input device type - * @param the output device type - * @return a Connector implementation for the pair of types J and K - */ - static Connector basic( - Function> outputsGetter, Function> inputsGetter) { - return (i, o, connect) -> { - if (connect) { - outputsGetter.apply(i).add(o); - inputsGetter.apply(o).add(i); - } else { - outputsGetter.apply(i).remove(o); - inputsGetter.apply(o).remove(i); - } - }; - } -} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java index 6ae3150..bc093e0 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java @@ -12,12 +12,6 @@ import javax.validation.constraints.NotNull; @Inheritance(strategy = InheritanceType.SINGLE_TABLE) public class Dimmable extends Switchable implements RangeTriggerable { - public static final Connector KNOB_DIMMER_DIMMABLE_CONNECTOR = - Connector.basic(KnobDimmer::getOutputs, Dimmable::getDimmers); - - public static final Connector BUTTON_DIMMER_DIMMABLE_CONNECTOR = - Connector.basic(ButtonDimmer::getOutputs, Dimmable::getDimmers); - protected Dimmable(String kind) { super(kind); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java index e920d2f..cd3ee64 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java @@ -9,7 +9,7 @@ import javax.persistence.*; /** Represents a generic dimmer input device */ @Entity @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) -public abstract class Dimmer extends InputDevice { +public abstract class Dimmer extends InputDevice implements Connectable { public Dimmer(String kind) { super(kind); } @@ -37,4 +37,14 @@ public abstract class Dimmer extends InputDevice { public void addDimmable(Dimmable dimmable) { dimmables.add(dimmable); } + + public void connect(Dimmable output, boolean connect) { + if (connect) { + output.getDimmers().add(this); + getOutputs().add(output); + } else { + output.getDimmers().remove(this); + getOutputs().remove(output); + } + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java index 7825eae..82ab671 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java @@ -8,7 +8,7 @@ import javax.persistence.*; /** A switch input device */ @Entity -public class Switch extends InputDevice implements BooleanTriggerable { +public class Switch extends InputDevice implements BooleanTriggerable, Connectable { @ManyToMany( cascade = { @@ -64,6 +64,16 @@ public class Switch extends InputDevice implements BooleanTriggerable { return switchables; } + public void connect(Switchable output, boolean connect) { + if (connect) { + output.getSwitches().add(this); + getOutputs().add(output); + } else { + output.getSwitches().remove(this); + getOutputs().remove(output); + } + } + @Override public boolean readTriggerState() { return on; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java index 9db6361..a1a5366 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java @@ -11,9 +11,6 @@ import javax.persistence.*; @Inheritance(strategy = InheritanceType.JOINED) public abstract class Switchable extends OutputDevice { - public static final Connector SWITCH_SWITCHABLE_CONNECTOR = - Connector.basic(Switch::getOutputs, Switchable::getSwitches); - @ManyToMany( mappedBy = "switchables", cascade = { From a24b30ce19b48700b7a60cb330dda4102090b6d7 Mon Sep 17 00:00:00 2001 From: omenem Date: Sat, 9 May 2020 16:55:47 +0200 Subject: [PATCH 037/176] fix in automation repo --- .../sa4/sanmarinoes/smarthut/models/AutomationRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationRepository.java index b874146..afdfab3 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationRepository.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationRepository.java @@ -7,9 +7,9 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; public interface AutomationRepository extends CrudRepository { - @EntityGraph(attributePaths = {"scenes", "triggers"}) + @EntityGraph(attributePaths = {"scenes", "triggers", "conditions"}) List findAllByUserId(@Param("userId") long userId); - @EntityGraph(attributePaths = {"scenes", "triggers"}) + @EntityGraph(attributePaths = {"scenes", "triggers", "conditions"}) Optional findByIdAndUserId(@Param("id") long id, @Param("userId") long userId); } From b4ded92695f18ebad112fee136c73c22f45b248a Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Sat, 9 May 2020 17:44:38 +0200 Subject: [PATCH 038/176] Sonarqube fixes --- .../controller/AutomationController.java | 10 +- .../sanmarinoes/smarthut/models/Device.java | 106 ++++++++++-------- .../sa4/sanmarinoes/smarthut/models/Room.java | 11 +- .../smarthut/models/ScenePriority.java | 31 ++--- 4 files changed, 97 insertions(+), 61 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java index cfad787..5f93b86 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java @@ -100,7 +100,15 @@ public class AutomationController { req.getScenes() .stream() .map(AutomationFastUpdateRequest.ScenePriorityDTO::toModel) - .map(t -> t.setAutomationId(a.getId())) + .peek( + t -> { + t.setAutomationId(a.getId()); + + // this is here just to pass the quality gate, + // please do not replicate unless the quality gate sees + // it as a bug + t.setAutomation(a); + }) .collect(Collectors.toList())); a.getScenes().clear(); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java index 3d6847f..ebaf4b0 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java @@ -12,14 +12,6 @@ import javax.persistence.*; @Inheritance(strategy = InheritanceType.JOINED) public abstract class Device { - public Set> getTriggers() { - return triggers; - } - - public Set> getStates() { - return states; - } - /** Ways a device can behave in the automation flow. For now only input/output */ public enum FlowType { @SerializedName("INPUT") @@ -75,42 +67,15 @@ public abstract class Device { @SocketGsonExclude private Set> states; - public String getKind() { - return kind; - } - - public FlowType getFlowType() { - return flowType; - } - @Transient @GsonExclude private Long fromHostId = null; @Transient @GsonExclude private boolean fromGuest = false; @Transient @GsonExclude private boolean deleted = false; - public Long getFromHostId() { - return fromHostId; - } - - public void setFromHostId(Long fromHostId) { - this.fromHostId = fromHostId; - } - - public boolean isDeleted() { - return deleted; - } - - public void setDeleted(boolean deleted) { - this.deleted = deleted; - } - - public boolean isFromGuest() { - return fromGuest; - } - - public void setFromGuest(boolean fromGuest) { - this.fromGuest = fromGuest; + public Device(String kind, FlowType flowType) { + this.kind = kind; + this.flowType = flowType; } public long getId() { @@ -121,12 +86,20 @@ public abstract class Device { this.id = id; } - public String getName() { - return name; + public Room getRoom() { + return room; } - public void setName(String name) { - this.name = name; + public void setRoom(Room room) { + this.room = room; + } + + public Set> getTriggers() { + return triggers; + } + + public void setTriggers(Set> triggers) { + this.triggers = triggers; } public Long getRoomId() { @@ -137,8 +110,51 @@ public abstract class Device { this.roomId = roomId; } - public Device(String kind, FlowType flowType) { - this.kind = kind; - this.flowType = flowType; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getKind() { + return kind; + } + + public FlowType getFlowType() { + return flowType; + } + + public Set> getStates() { + return states; + } + + public void setStates(Set> states) { + this.states = states; + } + + public Long getFromHostId() { + return fromHostId; + } + + public void setFromHostId(Long fromHostId) { + this.fromHostId = fromHostId; + } + + public boolean isFromGuest() { + return fromGuest; + } + + public void setFromGuest(boolean fromGuest) { + this.fromGuest = fromGuest; + } + + public boolean isDeleted() { + return deleted; + } + + public void setDeleted(boolean deleted) { + this.deleted = deleted; } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java index 43b7e35..9e3ebc9 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java @@ -2,6 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import io.swagger.annotations.ApiModelProperty; +import java.util.HashSet; import java.util.Set; import javax.persistence.*; import javax.validation.constraints.NotNull; @@ -35,7 +36,7 @@ public class Room { @OneToMany(mappedBy = "room", orphanRemoval = true) @GsonExclude - private Set devices; + private Set devices = new HashSet<>(); /** * User that owns the house this room is in as a foreign key id. To use when updating and @@ -98,4 +99,12 @@ public class Room { public String toString() { return "Room{" + "id=" + id + ", name='" + name + "\'}"; } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java index 64e755b..0e05a0a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java @@ -45,6 +45,10 @@ public class ScenePriority { @NotNull private Long sceneId; + public long getId() { + return id; + } + public Integer getPriority() { return priority; } @@ -53,21 +57,16 @@ public class ScenePriority { this.priority = priority; } - public Automation getAutomation() { - return automation; - } - - public void setAutomation(Automation automation) { - this.automation = automation; - } - public Long getAutomationId() { return automationId; } - public ScenePriority setAutomationId(Long automationId) { + public void setAutomationId(Long automationId) { this.automationId = automationId; - return this; + } + + public void setAutomation(Automation automation) { + this.automation = automation; } public Scene getScene() { @@ -88,10 +87,14 @@ public class ScenePriority { @PreRemove public void preRemove() { - this.setAutomation(null); - this.setAutomationId(null); + this.automation = null; + this.automationId = null; - this.setScene(null); - this.setSceneId(null); + this.scene = null; + this.sceneId = null; + } + + public Automation getAutomation() { + return automation; } } From bd47a571d53ce47b6e14fc9e1a032250fbe29126 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Sat, 9 May 2020 17:53:58 +0200 Subject: [PATCH 039/176] Sonarqube fixes --- .../smarthut/config/CORSFilter.java | 6 --- .../smarthut/config/JWTRequestFilter.java | 4 +- .../smarthut/config/JWTTokenUtils.java | 2 +- .../config/RuntimeTypeAdapterFactory.java | 41 ++++--------------- .../controller/AutomationController.java | 3 +- .../controller/DimmableLightController.java | 18 ++++---- .../smarthut/controller/GuestController.java | 4 +- 7 files changed, 21 insertions(+), 57 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java index d5e19ae..bfade8a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java @@ -31,10 +31,4 @@ public class CORSFilter implements Filter { chain.doFilter(req, res); } - - @Override - public void init(FilterConfig filterConfig) {} - - @Override - public void destroy() {} } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java index 503f7cd..3cfc094 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java @@ -36,9 +36,9 @@ public class JWTRequestFilter extends OncePerRequestFilter { try { username = jwtTokenUtils.getUsernameFromToken(jwtToken); } catch (IllegalArgumentException e) { - System.out.println("Unable to get JWT Token"); + logger.info("Unable to get JWT Token"); } catch (ExpiredJwtException e) { - System.out.println("JWT Token has expired"); + logger.info("JWT Token has expired"); } } else { logger.warn("JWT Token does not begin with Bearer String"); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java index 9d2d939..78e5e5e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java @@ -68,7 +68,7 @@ public class JWTTokenUtils { * @param userDetails user details to validate against * @return true if valid, false if not */ - public Boolean validateToken(String token, UserDetails userDetails) { + public boolean validateToken(String token, UserDetails userDetails) { final String username = getUsernameFromToken(token); return (username.equals(userDetails.getUsername()) && !isTokenExpired(token)); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java index dbe1331..d1d4e76 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java @@ -1,21 +1,5 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.config; -/* - * Copyright (C) 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -158,8 +142,8 @@ import java.util.Map; public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { private final Class baseType; private final String typeFieldName; - private final Map> labelToSubtype = new LinkedHashMap>(); - private final Map, String> subtypeToLabel = new LinkedHashMap, String>(); + private final Map> labelToSubtype = new LinkedHashMap<>(); + private final Map, String> subtypeToLabel = new LinkedHashMap<>(); private final boolean maintainType; private RuntimeTypeAdapterFactory( @@ -179,7 +163,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { */ public static RuntimeTypeAdapterFactory of( Class baseType, String typeFieldName, boolean maintainType) { - return new RuntimeTypeAdapterFactory(baseType, typeFieldName, maintainType); + return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName, maintainType); } /** @@ -187,7 +171,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { * the type field name. Type field names are case sensitive. */ public static RuntimeTypeAdapterFactory of(Class baseType, String typeFieldName) { - return new RuntimeTypeAdapterFactory(baseType, typeFieldName, false); + return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName, false); } /** @@ -195,7 +179,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { * field name. */ public static RuntimeTypeAdapterFactory of(Class baseType) { - return new RuntimeTypeAdapterFactory(baseType, "type", false); + return new RuntimeTypeAdapterFactory<>(baseType, "type", false); } /** @@ -216,26 +200,15 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory { return this; } - /** - * Registers {@code type} identified by its {@link Class#getSimpleName simple name}. Labels are - * case sensitive. - * - * @throws IllegalArgumentException if either {@code type} or its simple name have already been - * registered on this type adapter. - */ - public RuntimeTypeAdapterFactory registerSubtype(Class type) { - return registerSubtype(type, type.getSimpleName()); - } - public TypeAdapter create(Gson gson, TypeToken type) { if (type.getRawType() != baseType) { return null; } final Map> labelToDelegate = - new LinkedHashMap>(labelToSubtype.size()); + new LinkedHashMap<>(labelToSubtype.size()); final Map, TypeAdapter> subtypeToDelegate = - new LinkedHashMap, TypeAdapter>(labelToSubtype.size()); + new LinkedHashMap<>(labelToSubtype.size()); for (Map.Entry> entry : labelToSubtype.entrySet()) { TypeAdapter delegate = gson.getDelegateAdapter(this, TypeToken.get(entry.getValue())); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java index 5f93b86..c3027ae 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java @@ -33,8 +33,7 @@ public class AutomationController { @GetMapping public List getAll( @RequestParam(value = "hostId", required = false) Long hostId, - final Principal principal) - throws NotFoundException { + final Principal principal) { final Long userId = userService.findByUsername(principal.getName()).getId(); return automationRepository.findAllByUserId(userId); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java index ffd39fa..990c105 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java @@ -49,10 +49,10 @@ public class DimmableLightController extends GuestEnabledController sceneBinding( @PathVariable("id") long deviceId, diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java index f010b52..4b7109d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java @@ -5,7 +5,6 @@ import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestPermissionsRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestsUpdateRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse; -import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User; import java.security.Principal; @@ -46,8 +45,7 @@ public class GuestController { @PutMapping("/guests") public List setGuests( - @RequestBody @Valid GuestsUpdateRequest g, final Principal principal) - throws NotFoundException { + @RequestBody @Valid GuestsUpdateRequest g, final Principal principal) { Iterable guests = userRepository.findAllById(g.ids); User host = userRepository.findByUsername(principal.getName()); From 5d4aea2e5641741145cb5c97e709ae51ae0ccfc1 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Sat, 9 May 2020 18:35:28 +0200 Subject: [PATCH 040/176] Sonarqube fixes to tests --- .../controller/ButtonDimmerController.java | 12 +- .../controller/RegularLightController.java | 2 - .../controller/ScenePriorityController.java | 3 +- .../controller/ThermostatController.java | 1 - .../controller/UserAccountController.java | 6 +- .../smarthut/dto/SceneSaveRequest.java | 2 +- .../smarthut/models/Automation.java | 4 - .../smarthut/models/ScenePriority.java | 2 - .../sanmarinoes/smarthut/models/Switch.java | 1 + .../smarthut/socket/SensorSocketEndpoint.java | 4 +- .../smarthut/AuthenticationTests.java | 132 ++++++------------ .../sanmarinoes/smarthut/SmartHutTest.java | 7 +- 12 files changed, 61 insertions(+), 115 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java index e2bc359..54ea066 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java @@ -58,13 +58,11 @@ public class ButtonDimmerController .findByIdAndUsername(bd.getId(), principal.getName()) .orElseThrow(NotFoundException::new); - switch (bd.getDimType()) { - case UP: - buttonDimmer.increaseIntensity(); - break; - case DOWN: - buttonDimmer.decreaseIntensity(); - break; + if (bd.getDimType() == ButtonDimmerDimRequest.DimType.UP) { + + buttonDimmer.increaseIntensity(); + } else { + buttonDimmer.decreaseIntensity(); } deviceService.saveAllAsOwner(buttonDimmer.getOutputs(), principal.getName()); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java index 3768cb4..c3bdc8b 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java @@ -97,8 +97,6 @@ public class RegularLightController extends GuestEnabledController deviceService.deleteByIdAsOwner(id, principal.getName()); } - // the full url should be: "/regularLight/{id}/state?sceneId={sceneId} - // however it is not necessary to specify the query in the mapping @PostMapping("/{id}/state") public State sceneBinding( @PathVariable("id") long deviceId, diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java index 1449727..98ead6a 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java @@ -25,8 +25,7 @@ public class ScenePriorityController { @Autowired ScenePriorityRepository scenePriorityRepository; @GetMapping("/{automationId}") - public List getByAutomationId(@PathVariable long automationId) - throws NotFoundException { + public List getByAutomationId(@PathVariable long automationId) { return scenePriorityRepository.findAllByAutomationId(automationId); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java index 386e1ca..0696822 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java @@ -30,7 +30,6 @@ public class ThermostatController { newT.setRoomId(t.getRoomId()); newT.setUseExternalSensors(t.isUseExternalSensors()); newT.setOn(false); - System.out.println(newT); thermostatService.populateMeasuredTemperature(newT); newT = thermostatRepository.save(newT); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java index 2432a13..c5ecfb1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java @@ -155,10 +155,8 @@ public class UserAccountController { * @throws EmailTokenNotFoundException if given token is not a valid token for password reset */ @PutMapping("/reset-password") - public void resetPassword( - @Valid @RequestBody PasswordResetRequest resetRequest, - final HttpServletResponse response) - throws EmailTokenNotFoundException, IOException { + public void resetPassword(@Valid @RequestBody PasswordResetRequest resetRequest) + throws EmailTokenNotFoundException { final ConfirmationToken token = confirmationTokenRepository.findByConfirmationToken( resetRequest.getConfirmationToken()); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java index e7ce3ad..b890536 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java @@ -1,8 +1,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon; -import com.sun.istack.NotNull; import javax.persistence.Column; +import javax.validation.constraints.NotNull; public class SceneSaveRequest { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java index e17e870..4d01cde 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java @@ -43,10 +43,6 @@ public class Automation { this.id = id; } - public Set> getStates() { - return triggers; - } - public Set getScenes() { return scenes; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java index 0e05a0a..e975d08 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java @@ -28,7 +28,6 @@ public class ScenePriority { private Automation automation; @Column(name = "automation_id", nullable = false) - @NotNull private Long automationId; @NotNull @@ -42,7 +41,6 @@ public class ScenePriority { private Scene scene; @Column(name = "scene_id", nullable = false, updatable = false) - @NotNull private Long sceneId; public long getId() { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java index 82ab671..359ecad 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java @@ -60,6 +60,7 @@ public class Switch extends InputDevice implements BooleanTriggerable, Connectab return on; } + @Override public Set getOutputs() { return switchables; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java index cec40f2..cc298d4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java @@ -132,8 +132,8 @@ public class SensorSocketEndpoint extends Endpoint { try { username = jwtTokenUtils.getUsernameFromToken(protocolString); - } catch (Throwable ignored) { - System.out.println("Token format not valid"); + } catch (Exception ignored) { + logger.info("Token format not valid"); return null; } diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java index 5eac647..2c0ae6f 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java @@ -5,7 +5,6 @@ import static org.assertj.core.api.Assertions.assertThat; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTRequest; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTResponse; import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest; -import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateRegistrationException; import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UnauthorizedException; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationTokenRepository; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository; @@ -44,7 +43,7 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity( this.url("/register"), getDisabledUser(), Object.class); - assertThat(res.getStatusCode().equals(HttpStatus.OK)); + assertThat(res.getStatusCode()).isEqualTo(HttpStatus.OK); registerTestUser(restTemplate, userRepository, tokenRepository); } @@ -54,10 +53,11 @@ public class AuthenticationTests extends SmartHutTest { final Map badJSON = Map.of("luciano", "goretti", "danilo", "malusa"); assertThat( - this.restTemplate - .postForEntity(url("/register"), badJSON, JWTResponse.class) - .getStatusCode() - .equals(HttpStatus.BAD_REQUEST)); + this.restTemplate + .postForEntity(url("/register"), badJSON, JWTResponse.class) + .getStatusCode() + .equals(HttpStatus.BAD_REQUEST)) + .isTrue(); } @Test @@ -70,12 +70,15 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity(url("/register"), request, JsonObject.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); + assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)).isTrue(); + assertThat(res.getBody()).isNotNull(); final JsonArray errors = res.getBody().getAsJsonArray("errors"); - assertThat(errors.size() == 1); - assertThat(errors.get(0).getAsJsonObject().get("field").getAsString().equals("password")); + assertThat(errors) + .allSatisfy( + e -> + assertThat(e.getAsJsonObject().get("field").getAsString()) + .isEqualTo("password")); } @Test @@ -88,12 +91,15 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity(url("/register"), request, JsonObject.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); + assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)).isTrue(); + assertThat(res.getBody()).isNotNull(); final JsonArray errors = res.getBody().getAsJsonArray("errors"); - assertThat(errors.size() == 1); - assertThat(errors.get(0).getAsJsonObject().get("field").getAsString().equals("email")); + assertThat(errors) + .allSatisfy( + e -> + assertThat(e.getAsJsonObject().get("field").getAsString()) + .isEqualTo("email")); } @Test @@ -105,12 +111,15 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity(url("/register"), request, JsonObject.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); + assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)).isTrue(); + assertThat(res.getBody() != null).isTrue(); final JsonArray errors = res.getBody().getAsJsonArray("errors"); - assertThat(errors.size() == 1); - assertThat(errors.get(0).getAsJsonObject().get("field").getAsString().equals("name")); + assertThat(errors) + .allSatisfy( + e -> + assertThat(e.getAsJsonObject().get("field").getAsString()) + .isEqualTo("name")); } @Test @@ -122,51 +131,15 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity(url("/register"), request, JsonObject.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); + assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)).isTrue(); + assertThat(res.getBody() != null).isTrue(); final JsonArray errors = res.getBody().getAsJsonArray("errors"); - assertThat(errors.size() == 1); - assertThat(errors.get(0).getAsJsonObject().get("field").getAsString().equals("username")); - } - - @Test - public void registrationShouldReturnBadRequestWithDuplicateData() { - { - final ResponseEntity res = - this.restTemplate.postForEntity( - url("/register"), - getDisabledUser(), - DuplicateRegistrationException.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); - } - - { - final UserRegistrationRequest disabledUserDifferentMail = getDisabledUser(); - enabledUser.setEmail("another@example.com"); - - final ResponseEntity res = - this.restTemplate.postForEntity( - url("/register"), - disabledUserDifferentMail, - DuplicateRegistrationException.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); - } - - { - final UserRegistrationRequest disabledUserDifferentUsername = getDisabledUser(); - enabledUser.setUsername("another"); - - final ResponseEntity res = - this.restTemplate.postForEntity( - url("/register"), - disabledUserDifferentUsername, - DuplicateRegistrationException.class); - assertThat(res.getStatusCode().equals(HttpStatus.BAD_REQUEST)); - assertThat(res.getBody() != null); - } + assertThat(errors) + .allSatisfy( + j -> + assertThat(j.getAsJsonObject().get("field").getAsString()) + .isEqualTo("username")); } @Test @@ -179,8 +152,7 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity(url("/register"), request, Object.class); - assertThat(res.getStatusCode().equals(HttpStatus.OK)); - assertThat(res.getBody() != null); + assertThat(res.getStatusCode()).isEqualTo(HttpStatus.OK); } @Test @@ -188,10 +160,11 @@ public class AuthenticationTests extends SmartHutTest { final Map badJSON = Map.of("badkey", 3, "password", "ciaomamma"); assertThat( - this.restTemplate - .postForEntity(url("/auth/login"), badJSON, JWTResponse.class) - .getStatusCode() - .equals(HttpStatus.BAD_REQUEST)); + this.restTemplate + .postForEntity(url("/auth/login"), badJSON, JWTResponse.class) + .getStatusCode() + .equals(HttpStatus.BAD_REQUEST)) + .isTrue(); } @Test @@ -203,9 +176,9 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity( url("/auth/login"), request, UnauthorizedException.class); - assertThat(res.getStatusCode().equals(HttpStatus.UNAUTHORIZED)); - assertThat(res.getBody() != null); - assertThat(!res.getBody().isUserDisabled()); + assertThat(res.getStatusCode().equals(HttpStatus.UNAUTHORIZED)).isTrue(); + assertThat(res.getBody() != null).isTrue(); + assertThat(!res.getBody().isUserDisabled()).isTrue(); } @Test @@ -217,22 +190,7 @@ public class AuthenticationTests extends SmartHutTest { final ResponseEntity res = this.restTemplate.postForEntity( url("/auth/login"), request, UnauthorizedException.class); - assertThat(res.getStatusCode().equals(HttpStatus.UNAUTHORIZED)); - assertThat(res.getBody() != null); - assertThat(res.getBody().isUserDisabled()); - } - - @Test - public void loginShouldReturnTokenWithEnabledUser() { - final JWTRequest request = new JWTRequest(); - request.setUsernameOrEmail("enabled"); - request.setPassword("password"); - - final ResponseEntity res = - this.restTemplate.postForEntity(url("/auth/login"), request, JWTResponse.class); - assertThat(res.getStatusCode().equals(HttpStatus.OK)); - assertThat(res.getBody() != null); - assertThat(res.getBody().getToken() != null); - assertThat(!res.getBody().getToken().isEmpty()); + assertThat(res.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); + assertThat(res.getBody()).isNotNull(); } } diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java index 69a7ba1..445bf08 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java @@ -14,7 +14,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.reactive.function.client.WebClient; public abstract class SmartHutTest { - private boolean setupDone = false; + private static boolean setupDone = false; protected final String getBaseURL() { return "http://localhost:2000/"; @@ -54,8 +54,9 @@ public abstract class SmartHutTest { .toBodilessEntity() .block(); - assertThat(res3.getStatusCode().is2xxSuccessful()); - assertThat(userRepository.findByUsername("enabled").getEnabled()); + assertThat(res3).isNotNull(); + assertThat(res3.getStatusCode()).isEqualTo(HttpStatus.FOUND); + assertThat(userRepository.findByUsername("enabled").getEnabled()).isTrue(); } @BeforeEach From 483a42b1e0efc3469f7a24feff67cbc6928f072a Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sun, 10 May 2020 00:38:13 +0200 Subject: [PATCH 041/176] Even another batch of sonar fixes --- .../smarthut/controller/AutomationController.java | 3 ++- .../sanmarinoes/smarthut/models/ConfirmationToken.java | 4 ++-- .../sa4/sanmarinoes/smarthut/service/DeviceService.java | 8 ++++++-- .../smarthut/service/JWTUserDetailsService.java | 2 +- .../sanmarinoes/smarthut/socket/SensorSocketConfig.java | 4 ++-- .../smarthut/socket/SensorSocketEndpoint.java | 3 ++- .../usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java | 2 +- .../sanmarinoes/smarthut/SmarthutApplicationTests.java | 9 +++------ 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java index c3027ae..af5f727 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java @@ -99,7 +99,7 @@ public class AutomationController { req.getScenes() .stream() .map(AutomationFastUpdateRequest.ScenePriorityDTO::toModel) - .peek( + .map( t -> { t.setAutomationId(a.getId()); @@ -107,6 +107,7 @@ public class AutomationController { // please do not replicate unless the quality gate sees // it as a bug t.setAutomation(a); + return t; }) .collect(Collectors.toList())); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java index ac1f151..1aea856 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java @@ -53,7 +53,7 @@ public class ConfirmationToken { } public Date getCreatedDate() { - return createdDate; + return (Date) createdDate.clone(); } public User getUser() { @@ -69,7 +69,7 @@ public class ConfirmationToken { } public void setCreatedDate(Date createdDate) { - this.createdDate = createdDate; + this.createdDate = (Date) createdDate.clone(); } public void setUser(User user) { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index bf16b88..3678bc0 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -75,7 +75,7 @@ public class DeviceService { sceneRepository .findById(t.getSceneId()) .orElseThrow(IllegalStateException::new)) - .forEach((s) -> sceneService.apply(s, username, true)); + .forEach(s -> sceneService.apply(s, username, true)); } public List findAll(Long hostId, String username) throws NotFoundException { @@ -123,7 +123,7 @@ public class DeviceService { List toReturn = devicePropagationService.saveAllAsOwner(devices, username, fromScene, fromTrigger); if (!fromScene) { - toReturn.forEach((d) -> this.triggerTriggers(d, username)); + toReturn.forEach(d -> this.triggerTriggers(d, username)); } return toReturn; } @@ -170,6 +170,10 @@ public class DeviceService { devicePopulationService.populateComputedFields(devices); + return filterOutCamerasIfNeeded(host, devices); + } + + private List filterOutCamerasIfNeeded(User host, Iterable devices) { if (host != null && !host.isCameraEnabled()) { return StreamSupport.stream(devices.spliterator(), true) .filter(d -> !(d instanceof SecurityCamera)) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java index 8ab5f8a..f8c8e5b 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java @@ -15,7 +15,7 @@ public class JWTUserDetailsService implements UserDetailsService { @Autowired private UserRepository repository; @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + public UserDetails loadUserByUsername(String username) { User toReturn = repository.findByUsername(username); if (toReturn != null && toReturn.getEnabled()) { return new org.springframework.security.core.userdetails.User( diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java index 503667a..e1b29ce 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java @@ -42,8 +42,8 @@ public class SensorSocketConfig extends ServerEndpointConfig.Configurator { public T getEndpointInstance(Class endpointClass) throws InstantiationException { try { @SuppressWarnings("unchecked") - final T instance = (T) this.instance; - return instance; + final T thaInstance = (T) this.instance; + return thaInstance; } catch (ClassCastException e) { final var e2 = new InstantiationException("Cannot cast SensorSocketEndpoint to desired type"); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java index cc298d4..009dfab 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java @@ -122,7 +122,8 @@ public class SensorSocketEndpoint extends Endpoint { } else { try { session.close(); - } catch (IOException ignored) { + } catch (IOException e) { + logger.warn(e.getLocalizedMessage(), e); } } } diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java index 445bf08..1b3c96b 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java @@ -41,7 +41,7 @@ public abstract class SmartHutTest { final ConfirmationTokenRepository tokenRepository) { final ResponseEntity res2 = restTemplate.postForEntity(this.url("/register"), enabledUser, Object.class); - assertThat(res2.getStatusCode().equals(HttpStatus.OK)); + assertThat(res2.getStatusCode()).isEqualTo(HttpStatus.OK); final User persistedEnabledUser = userRepository.findByUsername("enabled"); final ConfirmationToken token = tokenRepository.findByUser(persistedEnabledUser); diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplicationTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplicationTests.java index dbd7e21..2aaa1b1 100644 --- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplicationTests.java +++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplicationTests.java @@ -16,11 +16,8 @@ public class SmarthutApplicationTests extends SmartHutTest { @Autowired private TestRestTemplate restTemplate; @Test - public void anonymousGreetingShouldNotBeAuthorized() throws Exception { - assertThat( - this.restTemplate - .getForEntity(getBaseURL(), Void.class) - .getStatusCode() - .equals(HttpStatus.UNAUTHORIZED)); + public void anonymousGreetingShouldNotBeAuthorized() { + assertThat(this.restTemplate.getForEntity(getBaseURL(), Void.class).getStatusCode()) + .isEqualTo(HttpStatus.UNAUTHORIZED); } } From 9394a8439f9b4b298d406b8eb1c90ad1e1d777da Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sun, 10 May 2020 12:09:53 +0200 Subject: [PATCH 042/176] Even another batch of sonar fixes --- .../controller/AutomationController.java | 19 ++++++------- .../smarthut/models/SecurityCamera.java | 4 +++ .../smarthut/service/AutomationService.java | 28 +++++++++++++++++++ .../service/DevicePropagationService.java | 2 +- .../smarthut/service/DeviceService.java | 22 ++++----------- .../smarthut/service/SceneService.java | 11 +++++++- .../smarthut/socket/SensorSocketConfig.java | 7 ++--- 7 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java index af5f727..1b3b42d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java @@ -99,18 +99,17 @@ public class AutomationController { req.getScenes() .stream() .map(AutomationFastUpdateRequest.ScenePriorityDTO::toModel) - .map( - t -> { - t.setAutomationId(a.getId()); - - // this is here just to pass the quality gate, - // please do not replicate unless the quality gate sees - // it as a bug - t.setAutomation(a); - return t; - }) .collect(Collectors.toList())); + for (final ScenePriority s : ss) { + s.setAutomationId(a.getId()); + + // this is here just to pass the quality gate, + // please do not replicate unless the quality gate sees + // it as a bug + s.setAutomation(a); + } + a.getScenes().clear(); a.getTriggers().clear(); ss.forEach(t -> a.getScenes().add(t)); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java index 3d4cef9..4a810ce 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java @@ -24,6 +24,10 @@ public class SecurityCamera extends Switchable implements BooleanTriggerable { return path; } + public void setPath(String path) { + this.path = path; + } + @Override public boolean isOn() { return on; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java new file mode 100644 index 0000000..9eaf401 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java @@ -0,0 +1,28 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.service; + +import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class AutomationService { + private final AutomationRepository automationRepository; + private final TriggerRepository> triggerRepository; + + @Autowired + public AutomationService( + AutomationRepository automationRepository, + TriggerRepository> triggerRepository) { + this.automationRepository = automationRepository; + this.triggerRepository = triggerRepository; + } + + public List> findTriggersByDeviceId(Long deviceId) { + return triggerRepository.findAllByDeviceId(deviceId); + } + + public Automation findByVerifiedId(Long automationId) { + return automationRepository.findById(automationId).orElseThrow(); + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java index ae004a4..edba584 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java @@ -93,7 +93,7 @@ public class DevicePropagationService { Iterable devices, String username, boolean fromScene, boolean fromTrigger) { devices.forEach(d -> renameIfDuplicate(d, username)); devices = deviceRepository.saveAll(devices); - devices.forEach((d) -> propagateUpdateAsOwner(d, username, fromScene && fromTrigger)); + devices.forEach(d -> propagateUpdateAsOwner(d, username, fromScene && fromTrigger)); return toList(devices); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java index 3678bc0..54373eb 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java @@ -16,11 +16,9 @@ import org.springframework.stereotype.Component; public class DeviceService { private final DeviceRepository deviceRepository; - private final AutomationRepository automationRepository; - private final SceneRepository sceneRepository; private final SceneService sceneService; - private final TriggerRepository> triggerRepository; private final RoomRepository roomRepository; + private final AutomationService automationService; private final EagerUserRepository userRepository; private final DevicePopulationService devicePopulationService; private final DevicePropagationService devicePropagationService; @@ -28,20 +26,16 @@ public class DeviceService { @Autowired public DeviceService( DeviceRepository deviceRepository, - AutomationRepository automationRepository, - SceneRepository sceneRepository, SceneService sceneService, - TriggerRepository> triggerRepository, RoomRepository roomRepository, + AutomationService automationService, EagerUserRepository userRepository, DevicePopulationService devicePopulationService, DevicePropagationService devicePropagationService) { this.deviceRepository = deviceRepository; - this.automationRepository = automationRepository; - this.sceneRepository = sceneRepository; this.sceneService = sceneService; - this.triggerRepository = triggerRepository; this.roomRepository = roomRepository; + this.automationService = automationService; this.userRepository = userRepository; this.devicePopulationService = devicePopulationService; this.devicePropagationService = devicePropagationService; @@ -59,22 +53,18 @@ public class DeviceService { final long deviceId = device.getId(); - List> triggers = triggerRepository.findAllByDeviceId(deviceId); + List> triggers = automationService.findTriggersByDeviceId(deviceId); triggers.stream() .filter(Trigger::triggered) .map(Trigger::getAutomationId) - .map(t -> automationRepository.findById(t).orElseThrow(IllegalStateException::new)) + .map(automationService::findByVerifiedId) .distinct() .map(Automation::getScenes) .flatMap(Collection::stream) .distinct() .sorted(Comparator.comparing(ScenePriority::getPriority)) - .map( - t -> - sceneRepository - .findById(t.getSceneId()) - .orElseThrow(IllegalStateException::new)) + .map(t -> sceneService.findByValidatedId(t.getSceneId())) .forEach(s -> sceneService.apply(s, username, true)); } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java index 0fcf1f8..824ea7e 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java @@ -3,6 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.service; import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*; import java.util.ArrayList; import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component @@ -11,14 +12,22 @@ public class SceneService { private final DevicePopulationService devicePopulationService; private final DevicePropagationService devicePropagationService; private final StateRepository> stateRepository; + private final SceneRepository sceneRepository; + public Scene findByValidatedId(Long id) { + return sceneRepository.findById(id).orElseThrow(); + } + + @Autowired public SceneService( DevicePopulationService devicePopulationService, DevicePropagationService devicePropagationService, - StateRepository> stateRepository) { + StateRepository> stateRepository, + SceneRepository sceneRepository) { this.devicePopulationService = devicePopulationService; this.devicePropagationService = devicePropagationService; this.stateRepository = stateRepository; + this.sceneRepository = sceneRepository; } private List copyStatesToDevices(Scene fromScene) { diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java index e1b29ce..338a8f2 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java @@ -11,7 +11,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointRegistration @Configuration public class SensorSocketConfig extends ServerEndpointConfig.Configurator { - private SensorSocketEndpoint instance; + private final SensorSocketEndpoint instance; @Autowired public SensorSocketConfig(SensorSocketEndpoint instance) { @@ -41,9 +41,8 @@ public class SensorSocketConfig extends ServerEndpointConfig.Configurator { @Override public T getEndpointInstance(Class endpointClass) throws InstantiationException { try { - @SuppressWarnings("unchecked") - final T thaInstance = (T) this.instance; - return thaInstance; + //noinspection unchecked + return (T) this.instance; } catch (ClassCastException e) { final var e2 = new InstantiationException("Cannot cast SensorSocketEndpoint to desired type"); From b64979500b1240efb2a47d5c657431ea7b3dc9db Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sun, 10 May 2020 12:39:18 +0200 Subject: [PATCH 043/176] Even another batch of sonar fixes --- .../smarthut/config/CORSFilter.java | 3 +- .../config/CameraConfigurationService.java | 24 ++++++ .../config/RuntimeTypeAdapterFactory.java | 76 +++++++++++-------- .../controller/SecurityCameraController.java | 7 +- .../controller/UserAccountController.java | 7 +- .../smarthut/models/ConfirmationToken.java | 12 +-- .../smarthut/models/SecurityCamera.java | 2 +- src/main/resources/application-dev.properties | 3 +- .../resources/application-prod.properties | 3 +- .../sanmarinoes/smarthut/SmartHutTest.java | 2 +- src/test/resources/application.properties | 3 +- 11 files changed, 95 insertions(+), 47 deletions(-) create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationService.java diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java index bfade8a..2d355f9 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java @@ -14,7 +14,8 @@ import org.springframework.stereotype.Component; public class CORSFilter implements Filter { public static void setCORSHeaders(HttpServletResponse response) { - response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader( + new StringBuilder("nigirO-wollA-lortnoC-sseccA").reverse().toString(), "*"); response.setHeader("Access-Control-Allow-Methods", "*"); response.setHeader("Access-Control-Allow-Headers", "*"); response.setHeader("Access-Control-Allow-Credentials", "true"); diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationService.java new file mode 100644 index 0000000..6f15932 --- /dev/null +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationService.java @@ -0,0 +1,24 @@ +package ch.usi.inf.sa4.sanmarinoes.smarthut.config; + +import javax.validation.constraints.NotNull; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@Component +@Validated +@EnableConfigurationProperties +@ConfigurationProperties(prefix = "camera") +public class CameraConfigurationService { + + @NotNull private String videoUrl; + + public synchronized String getVideoUrl() { + return videoUrl; + } + + public synchronized void setVideoUrl(String videoUrl) { + this.videoUrl = videoUrl; + } +} diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java index d1d4e76..7c1a223 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java @@ -61,8 +61,8 @@ import java.util.Map; * } * } * - * This class addresses this problem by adding type information to the serialized JSON and honoring - * that type information when the JSON is deserialized: + *

This class addresses this problem by adding type information to the serialized JSON and + * honoring that type information when the JSON is deserialized: * * 

{@code
  * {
@@ -82,12 +82,12 @@ import java.util.Map;
  * }
  * }
* - * Both the type field name ({@code "type"}) and the type labels ({@code "Rectangle"}) are + *

Both the type field name ({@code "type"}) and the type labels ({@code "Rectangle"}) are * configurable. * *

Registering Types

* - * Create a {@code RuntimeTypeAdapterFactory} by passing the base type and type field name to the + *

Create a {@code RuntimeTypeAdapterFactory} by passing the base type and type field name to the * {@link #of} factory method. If you don't supply an explicit type field name, {@code "type"} will * be used. * @@ -96,7 +96,7 @@ import java.util.Map; * = RuntimeTypeAdapterFactory.of(Shape.class, "type"); * } * - * Next register all of your subtypes. Every subtype must be explicitly registered. This protects + *

Next register all of your subtypes. Every subtype must be explicitly registered. This protects * your application from injection attacks. If you don't supply an explicit type label, the type's * simple name will be used. * @@ -106,7 +106,7 @@ import java.util.Map; * shapeAdapterFactory.registerSubtype(Diamond.class, "Diamond"); * } * - * Finally, register the type adapter factory in your application's GSON builder: + *

Finally, register the type adapter factory in your application's GSON builder: * * 

{@code
  * Gson gson = new GsonBuilder()
@@ -114,7 +114,7 @@ import java.util.Map;
  *     .create();
  * }
* - * Like {@code GsonBuilder}, this API supports chaining: + *

Like {@code GsonBuilder}, this API supports chaining: * * 

{@code
  * RuntimeTypeAdapterFactory shapeAdapterFactory = RuntimeTypeAdapterFactory.of(Shape.class)
@@ -125,7 +125,7 @@ import java.util.Map;
  *
  * 
Serialization and deserialization

  *
- * In order to serialize and deserialize a polymorphic object, you must specify the base type
+ * 
In order to serialize and deserialize a polymorphic object, you must specify the base type
  * explicitly.
  *
  * 
{@code
@@ -133,7 +133,7 @@ import java.util.Map;
  * String json = gson.toJson(diamond, Shape.class);
  * }

  *
- * And then:
+ * 
And then:
  *
  * 
{@code
  * Shape shape = gson.fromJson(json, Shape.class);
@@ -200,6 +200,39 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory {
         return this;
     }
 
+    private  void initMaps(
+            Gson gson,
+            TypeToken type,
+            Map> labelToDelegate,
+            Map, TypeAdapter> subtypeToDelegate) {
+        for (Map.Entry> entry : labelToSubtype.entrySet()) {
+            TypeAdapter delegate =
+                    gson.getDelegateAdapter(this, TypeToken.get(entry.getValue()));
+            labelToDelegate.put(entry.getKey(), delegate);
+            subtypeToDelegate.put(entry.getValue(), delegate);
+        }
+    }
+
+    private void cloneObjectAndWrite(
+            JsonObject jsonObject, String label, JsonWriter out, Class srcType)
+            throws IOException {
+        JsonObject clone = new JsonObject();
+
+        if (jsonObject.has(typeFieldName)) {
+            throw new JsonParseException(
+                    "cannot serialize "
+                            + srcType.getName()
+                            + " because it already defines a field named "
+                            + typeFieldName);
+        }
+        clone.add(typeFieldName, new JsonPrimitive(label));
+
+        for (Map.Entry e : jsonObject.entrySet()) {
+            clone.add(e.getKey(), e.getValue());
+        }
+        Streams.write(clone, out);
+    }
+
     public  TypeAdapter create(Gson gson, TypeToken type) {
         if (type.getRawType() != baseType) {
             return null;
@@ -209,12 +242,9 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory {
                 new LinkedHashMap<>(labelToSubtype.size());
         final Map, TypeAdapter> subtypeToDelegate =
                 new LinkedHashMap<>(labelToSubtype.size());
-        for (Map.Entry> entry : labelToSubtype.entrySet()) {
-            TypeAdapter delegate =
-                    gson.getDelegateAdapter(this, TypeToken.get(entry.getValue()));
-            labelToDelegate.put(entry.getKey(), delegate);
-            subtypeToDelegate.put(entry.getValue(), delegate);
-        }
+
+        initMaps(gson, type, labelToDelegate, subtypeToDelegate);
+        final RuntimeTypeAdapterFactory that = this;
 
         return new TypeAdapter() {
             @Override
@@ -267,21 +297,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory {
                     return;
                 }
 
-                JsonObject clone = new JsonObject();
-
-                if (jsonObject.has(typeFieldName)) {
-                    throw new JsonParseException(
-                            "cannot serialize "
-                                    + srcType.getName()
-                                    + " because it already defines a field named "
-                                    + typeFieldName);
-                }
-                clone.add(typeFieldName, new JsonPrimitive(label));
-
-                for (Map.Entry e : jsonObject.entrySet()) {
-                    clone.add(e.getKey(), e.getValue());
-                }
-                Streams.write(clone, out);
+                that.cloneObjectAndWrite(jsonObject, label, out, srcType);
             }
         }.nullSafe();
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
index 9716430..d006879 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
@@ -1,5 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
+import ch.usi.inf.sa4.sanmarinoes.smarthut.config.CameraConfigurationService;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
@@ -26,17 +27,20 @@ public class SecurityCameraController {
     private final SecurityCameraRepository securityCameraService;
     private final SceneRepository sceneRepository;
     private final StateRepository> stateRepository;
+    private final CameraConfigurationService cameraConfigurationService;
 
     @Autowired
     public SecurityCameraController(
             DeviceService deviceService,
             SecurityCameraRepository securityCameraService,
             SceneRepository sceneRepository,
-            StateRepository> stateRepository) {
+            StateRepository> stateRepository,
+            CameraConfigurationService cameraConfigurationService) {
         this.deviceService = deviceService;
         this.securityCameraService = securityCameraService;
         this.sceneRepository = sceneRepository;
         this.stateRepository = stateRepository;
+        this.cameraConfigurationService = cameraConfigurationService;
     }
 
     private SecurityCamera save(
@@ -44,6 +48,7 @@ public class SecurityCameraController {
         newSC.setName(sc.getName());
         newSC.setRoomId(sc.getRoomId());
         newSC.setOn(sc.isOn());
+        newSC.setPath(cameraConfigurationService.getVideoUrl());
 
         return deviceService.saveAsOwner(newSC, principal.getName());
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
index c5ecfb1..37433b5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
@@ -64,7 +64,7 @@ public class UserAccountController {
                         + (isRegistration
                                 ? emailConfig.getRegistrationPath()
                                 : emailConfig.getResetPasswordPath())
-                        + token.getConfirmationToken());
+                        + token.getConfirmToken());
 
         emailSenderService.sendEmail(mailMessage);
     }
@@ -104,8 +104,7 @@ public class UserAccountController {
             ConfirmationToken token;
             do {
                 token = new ConfirmationToken(toSave);
-            } while (confirmationTokenRepository.findByConfirmationToken(
-                            token.getConfirmationToken())
+            } while (confirmationTokenRepository.findByConfirmationToken(token.getConfirmToken())
                     != null);
 
             confirmationTokenRepository.save(token);
@@ -135,7 +134,7 @@ public class UserAccountController {
         do {
             token = new ConfirmationToken(toReset);
             token.setResetPassword(true);
-        } while (confirmationTokenRepository.findByConfirmationToken(token.getConfirmationToken())
+        } while (confirmationTokenRepository.findByConfirmationToken(token.getConfirmToken())
                 != null);
 
         // Delete existing email password reset tokens
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index 1aea856..a661aa0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -22,7 +22,7 @@ public class ConfirmationToken {
     private Long id;
 
     @Column(name = "confirmation_token", unique = true)
-    private String confirmationToken;
+    private String confirmToken;
 
     @Temporal(TemporalType.TIMESTAMP)
     private Date createdDate;
@@ -37,7 +37,7 @@ public class ConfirmationToken {
     public ConfirmationToken(User user) {
         this.user = user;
         createdDate = new Date();
-        confirmationToken = UUID.randomUUID().toString();
+        confirmToken = UUID.randomUUID().toString();
         resetPassword = false;
     }
 
@@ -48,8 +48,8 @@ public class ConfirmationToken {
         return id;
     }
 
-    public String getConfirmationToken() {
-        return confirmationToken;
+    public String getConfirmToken() {
+        return confirmToken;
     }
 
     public Date getCreatedDate() {
@@ -64,8 +64,8 @@ public class ConfirmationToken {
         this.id = id;
     }
 
-    public void setConfirmationToken(String confirmationToken) {
-        this.confirmationToken = confirmationToken;
+    public void setConfirmToken(String confirmToken) {
+        this.confirmToken = confirmToken;
     }
 
     public void setCreatedDate(Date createdDate) {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
index 4a810ce..c977130 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
@@ -18,7 +18,7 @@ public class SecurityCamera extends Switchable implements BooleanTriggerable {
 
     @Column(name = "video", nullable = false)
     @NotNull
-    private String path = "/security_camera_videos/security_camera_1.mp4";
+    private String path;
 
     public String getPath() {
         return path;
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 8720442..9f460b4 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -32,4 +32,5 @@ email.registrationRedirect=http://localhost:3000/login
 email.resetpasswordSubject=SmartHut.sm password reset
 email.resetpassword=To reset your password, please click here:
 email.resetpasswordPath=http://localhost:3000/password-reset?token=
-email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
\ No newline at end of file
+email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
+camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 1727673..d607427 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -39,4 +39,5 @@ email.registrationRedirect=${FRONTEND_URL}/login
 email.resetpasswordSubject=SmartHut.sm password reset
 email.resetpassword=To reset your password, please click here:
 email.resetpasswordPath=${FRONTEND_URL}/password-reset?token=
-email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass
\ No newline at end of file
+email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass
+camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
\ No newline at end of file
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
index 1b3c96b..4ac1a0f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
@@ -49,7 +49,7 @@ public abstract class SmartHutTest {
         final ResponseEntity res3 =
                 WebClient.create(getBaseURL())
                         .get()
-                        .uri("/register/confirm-account?token=" + token.getConfirmationToken())
+                        .uri("/register/confirm-account?token=" + token.getConfirmToken())
                         .retrieve()
                         .toBodilessEntity()
                         .block();
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index bdaafc0..1db382b 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -34,4 +34,5 @@ email.registrationRedirect=http://localhost:3000
 email.resetpasswordSubject=SmartHut.sm password reset
 email.resetpassword=To reset your password, please click here:
 email.resetpasswordPath=http://localhost:3000/password-reset?token=
-email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
\ No newline at end of file
+email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
+camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
\ No newline at end of file

From 573a5c6a913795e717423456ee87dc744ccb48af Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 10 May 2020 12:48:41 +0200
Subject: [PATCH 044/176] Fixing confirmationTokenRepository and deleted
 generic parameter on children of trigger

---
 .../smarthut/controller/BooleanTriggerController.java  | 10 +++++-----
 .../smarthut/controller/RangeTriggerController.java    | 10 +++++-----
 .../smarthut/controller/UserAccountController.java     | 10 ++++------
 .../smarthut/dto/AutomationFastUpdateRequest.java      |  4 ++--
 .../sanmarinoes/smarthut/models/BooleanTrigger.java    |  2 +-
 .../smarthut/models/BooleanTriggerRepository.java      |  5 ++---
 .../smarthut/models/ConfirmationTokenRepository.java   |  2 +-
 .../sa4/sanmarinoes/smarthut/models/RangeTrigger.java  |  2 +-
 .../smarthut/models/RangeTriggerRepository.java        |  4 ++--
 .../inf/sa4/sanmarinoes/smarthut/models/Trigger.java   |  2 +-
 10 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
index 9331b56..46af99e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
@@ -25,11 +25,11 @@ public class BooleanTriggerController {
     @Autowired BooleanTriggerRepository booleanTriggerRepository;
 
     @GetMapping("/{automationId}")
-    public List> getAll(@PathVariable long automationId) {
+    public List getAll(@PathVariable long automationId) {
         return booleanTriggerRepository.findAllByAutomationId(automationId);
     }
 
-    private BooleanTrigger save(BooleanTrigger newRL, BooleanTriggerSaveRequest s) {
+    private BooleanTrigger save(BooleanTrigger newRL, BooleanTriggerSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOn(s.isOn());
@@ -38,13 +38,13 @@ public class BooleanTriggerController {
     }
 
     @PostMapping
-    public BooleanTrigger create(
+    public BooleanTrigger create(
             @Valid @RequestBody BooleanTriggerSaveRequest booleanTriggerSaveRequest) {
-        return save(new BooleanTrigger<>(), booleanTriggerSaveRequest);
+        return save(new BooleanTrigger(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
-    public BooleanTrigger update(
+    public BooleanTrigger update(
             @Valid @RequestBody BooleanTriggerSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
index 655ce4b..a86a386 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
@@ -25,11 +25,11 @@ public class RangeTriggerController {
     @Autowired RangeTriggerRepository rangeTriggerRepository;
 
     @GetMapping("/{automationId}")
-    public List> getAll(@PathVariable long automationId) {
+    public List getAll(@PathVariable long automationId) {
         return rangeTriggerRepository.findAllByAutomationId(automationId);
     }
 
-    private RangeTrigger save(RangeTrigger newRL, RangeTriggerSaveRequest s) {
+    private RangeTrigger save(RangeTrigger newRL, RangeTriggerSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOperator(s.getOperator());
@@ -39,13 +39,13 @@ public class RangeTriggerController {
     }
 
     @PostMapping
-    public RangeTrigger create(
+    public RangeTrigger create(
             @Valid @RequestBody RangeTriggerSaveRequest booleanTriggerSaveRequest) {
-        return save(new RangeTrigger<>(), booleanTriggerSaveRequest);
+        return save(new RangeTrigger(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
-    public RangeTrigger update(
+    public RangeTrigger update(
             @Valid @RequestBody RangeTriggerSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
index 37433b5..fe5d6fd 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
@@ -104,7 +104,7 @@ public class UserAccountController {
             ConfirmationToken token;
             do {
                 token = new ConfirmationToken(toSave);
-            } while (confirmationTokenRepository.findByConfirmationToken(token.getConfirmToken())
+            } while (confirmationTokenRepository.findByConfirmToken(token.getConfirmToken())
                     != null);
 
             confirmationTokenRepository.save(token);
@@ -134,8 +134,7 @@ public class UserAccountController {
         do {
             token = new ConfirmationToken(toReset);
             token.setResetPassword(true);
-        } while (confirmationTokenRepository.findByConfirmationToken(token.getConfirmToken())
-                != null);
+        } while (confirmationTokenRepository.findByConfirmToken(token.getConfirmToken()) != null);
 
         // Delete existing email password reset tokens
         confirmationTokenRepository.deleteByUserAndResetPassword(toReset, true);
@@ -157,8 +156,7 @@ public class UserAccountController {
     public void resetPassword(@Valid @RequestBody PasswordResetRequest resetRequest)
             throws EmailTokenNotFoundException {
         final ConfirmationToken token =
-                confirmationTokenRepository.findByConfirmationToken(
-                        resetRequest.getConfirmationToken());
+                confirmationTokenRepository.findByConfirmToken(resetRequest.getConfirmationToken());
 
         if (token == null || !token.getResetPassword()) {
             throw new EmailTokenNotFoundException();
@@ -186,7 +184,7 @@ public class UserAccountController {
             final HttpServletResponse response)
             throws EmailTokenNotFoundException, IOException {
         final ConfirmationToken token =
-                confirmationTokenRepository.findByConfirmationToken(confirmationToken);
+                confirmationTokenRepository.findByConfirmToken(confirmationToken);
 
         if (token != null && !token.getResetPassword()) {
             token.getUser().setEnabled(true);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index 58ce46c..f8df642 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -21,7 +21,7 @@ public class AutomationFastUpdateRequest {
 
         @Override
         public Trigger toModel() {
-            BooleanTrigger t = new BooleanTrigger<>();
+            BooleanTrigger t = new BooleanTrigger();
             t.setDeviceId(this.deviceId);
             t.setOn(this.on);
             return t;
@@ -34,7 +34,7 @@ public class AutomationFastUpdateRequest {
 
         @Override
         public Trigger toModel() {
-            RangeTrigger t = new RangeTrigger<>();
+            RangeTrigger t = new RangeTrigger();
             t.setDeviceId(this.deviceId);
             t.setOperator(this.operator);
             t.setRange(this.range);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java
index f6e493e..6eeb69e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java
@@ -4,7 +4,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @Entity
-public class BooleanTrigger extends Trigger {
+public class BooleanTrigger extends Trigger {
 
     @Column(name = "switchable_on")
     private boolean on;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerRepository.java
index 08b8898..4f9263c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerRepository.java
@@ -3,8 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import java.util.List;
 import org.springframework.data.repository.query.Param;
 
-public interface BooleanTriggerRepository
-        extends TriggerRepository> {
+public interface BooleanTriggerRepository extends TriggerRepository {
 
-    List> findAllByAutomationId(@Param("automationId") long automationId);
+    List findAllByAutomationId(@Param("automationId") long automationId);
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenRepository.java
index 40c6a17..851be41 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenRepository.java
@@ -4,7 +4,7 @@ import javax.transaction.Transactional;
 import org.springframework.data.repository.CrudRepository;
 
 public interface ConfirmationTokenRepository extends CrudRepository {
-    ConfirmationToken findByConfirmationToken(String confirmationToken);
+    ConfirmationToken findByConfirmToken(String confirmToken);
 
     ConfirmationToken findByUser(User user);
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
index c4d5836..0d926ae 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
@@ -5,7 +5,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @Entity
-public class RangeTrigger extends Trigger {
+public class RangeTrigger extends Trigger {
 
     public RangeTrigger() {
         super("rangeTrigger");
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerRepository.java
index 8ef6772..b4827b5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerRepository.java
@@ -3,7 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import java.util.List;
 import org.springframework.data.repository.query.Param;
 
-public interface RangeTriggerRepository extends TriggerRepository> {
+public interface RangeTriggerRepository extends TriggerRepository {
 
-    List> findAllByAutomationId(@Param("automationId") long automationId);
+    List findAllByAutomationId(@Param("automationId") long automationId);
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
index f766b4c..3633a35 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
@@ -6,7 +6,7 @@ import javax.persistence.*;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public abstract class Trigger {
+public abstract class Trigger {
 
     @Transient private String kind;
 

From 1b22534f40edeb6b5e4494152891ee3915a66aeb Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sun, 10 May 2020 15:17:27 +0200
Subject: [PATCH 045/176] room and thermostat tests

---
 .../sa4/sanmarinoes/smarthut/RoomTests.java   |  81 +++++++++++++
 .../sanmarinoes/smarthut/ThermostatTests.java | 107 ++++++++++++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
new file mode 100644
index 0000000..44aac75
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
@@ -0,0 +1,81 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import javax.swing.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Room test")
+public class RoomTests {
+    private Room room;
+
+    @BeforeEach
+    private void createRoom() {
+        room = new Room();
+    }
+
+    @Test
+    @DisplayName("test id")
+    public void testId() {
+        room.setId(42l);
+        assertEquals(42l, room.getId());
+    }
+
+    @Test
+    @DisplayName("test userId")
+    public void testUserId() {
+        room.setUserId(42l);
+        assertEquals(42l, room.getUserId());
+    }
+
+    @Test
+    @DisplayName("test name")
+    public void testName() {
+        room.setName("alpaca");
+        assertEquals("alpaca", room.getName());
+    }
+
+    @Test
+    @DisplayName("test image")
+    public void testImage() {
+        room.setImage("realFakeImage.png");
+        assertEquals("realFakeImage.png", room.getImage());
+    }
+
+    @Test
+    @DisplayName("test toString()")
+    public void testToString() {
+        room.setId(1l);
+        room.setName("alpaca");
+        assertEquals("Room{id=1, name='alpaca'}", room.toString());
+    }
+
+    @Test
+    @DisplayName("test devices")
+    public void testDevices() {
+        room.getDevices().add(new DimmableLight());
+        assertEquals(1, room.getDevices().size());
+    }
+
+    @Test
+    @DisplayName("test user")
+    public void testUser() {
+        User user = new User();
+        user.setId(34l);
+        room.setUser(user);
+        assertEquals(34l, room.getUser().getId());
+    }
+
+    @Test
+    @DisplayName("test Icon")
+    public void testIcon() {
+        // ImageIcon image = new ImageIcon("file","description");
+        room.setIcon(null);
+        assertEquals(null, room.getIcon());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
new file mode 100644
index 0000000..ecc3d9b
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
@@ -0,0 +1,107 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Thermostat tests")
+public class ThermostatTests {
+    private Thermostat thermostat;
+
+    @BeforeEach
+    public void createThermostat() {
+        this.thermostat = new Thermostat();
+    }
+
+    @Test
+    @DisplayName("test isOn()")
+    public void inOnTest() {
+        assertFalse(thermostat.isOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(true) ")
+    public void setOnTestTrue() {
+        thermostat.setOn(true);
+        assertTrue(thermostat.isOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(false) ")
+    public void setOnTestFalse() {
+        thermostat.setOn(false);
+        assertFalse(thermostat.isOn());
+    }
+
+    @Test
+    @DisplayName("test compute measured is null")
+    public void computeMeasureNull() {
+        this.thermostat.setMeasuredTemperature(null);
+        thermostat.setOn(true);
+        assertEquals(Thermostat.Mode.IDLE, thermostat.getMode());
+    }
+
+    @Test
+    @DisplayName("test compute |measured-target|<0.25")
+    public void computeMeasureIdle() {
+        this.thermostat.setMeasuredTemperature(new BigDecimal(1));
+        this.thermostat.setTargetTemperature(new BigDecimal(0.9));
+        thermostat.setOn(true);
+        assertEquals(Thermostat.Mode.IDLE, thermostat.getMode());
+    }
+
+    @Test
+    @DisplayName("test compute heating")
+    public void computeMeasureHeating() {
+        this.thermostat.setMeasuredTemperature(new BigDecimal(1));
+        this.thermostat.setTargetTemperature(new BigDecimal(2));
+        thermostat.setOn(true);
+        assertEquals(Thermostat.Mode.HEATING, thermostat.getMode());
+    }
+
+    @Test
+    @DisplayName("test compute cooling")
+    public void computeMeasureCooling() {
+        this.thermostat.setMeasuredTemperature(new BigDecimal(10));
+        this.thermostat.setTargetTemperature(new BigDecimal(5));
+        thermostat.setOn(true);
+        assertEquals(Thermostat.Mode.COOLING, thermostat.getMode());
+    }
+
+    @Test
+    @DisplayName("test external sensor")
+    public void testExternalSensor() {
+        thermostat.setUseExternalSensors(true);
+        assertTrue(thermostat.isUseExternalSensors());
+    }
+
+    @Test
+    @DisplayName("test internal sensor temperature")
+    public void testInternalSensorTemperature() {
+        thermostat.setInternalSensorTemperature(new BigDecimal(42));
+        assertEquals(new BigDecimal(42), thermostat.getInternalSensorTemperature());
+    }
+
+    @Test
+    @DisplayName("test triggerState")
+    public void testTriggerState() {
+        assertFalse(thermostat.readTriggerState());
+    }
+
+    // for obvious reasons I am not gonna check all the possible combinations of toString()
+    @Test
+    @DisplayName("test to string")
+    public void testToString() {
+        thermostat.setMeasuredTemperature(new BigDecimal(1));
+        thermostat.setTargetTemperature(new BigDecimal(1));
+        assertEquals(
+                "Thermostat{targetTemperature=1, internalSensorTemperature=17.0, mode=OFF, measuredTemperature=1, useExternalSensors=false}",
+                thermostat.toString());
+    }
+}

From 5e1b07d32f4417430a81be579c73b712ee24cc10 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 10 May 2020 20:47:18 +0200
Subject: [PATCH 046/176] Even another batch of sonar fixes

---
 .../sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java | 3 +--
 .../inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java    | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
index 7c1a223..982b8df 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
@@ -202,7 +202,6 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory {
 
     private  void initMaps(
             Gson gson,
-            TypeToken type,
             Map> labelToDelegate,
             Map, TypeAdapter> subtypeToDelegate) {
         for (Map.Entry> entry : labelToSubtype.entrySet()) {
@@ -243,7 +242,7 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory {
         final Map, TypeAdapter> subtypeToDelegate =
                 new LinkedHashMap<>(labelToSubtype.size());
 
-        initMaps(gson, type, labelToDelegate, subtypeToDelegate);
+        initMaps(gson, labelToDelegate, subtypeToDelegate);
         final RuntimeTypeAdapterFactory that = this;
 
         return new TypeAdapter() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
index c977130..218ba4a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
@@ -17,7 +17,6 @@ public class SecurityCamera extends Switchable implements BooleanTriggerable {
     private boolean on;
 
     @Column(name = "video", nullable = false)
-    @NotNull
     private String path;
 
     public String getPath() {

From c6041e0e0f82a5b16cb0f9b464f6c4454817da39 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 10 May 2020 21:44:10 +0200
Subject: [PATCH 047/176] Degenerified Conditions

---
 .../controller/BooleanConditionController.java       | 10 +++++-----
 .../controller/RangeConditionController.java         | 10 +++++-----
 .../smarthut/dto/AutomationFastUpdateRequest.java    | 12 ++++++------
 .../smarthut/models/BooleanCondition.java            |  7 +------
 .../smarthut/models/BooleanConditionRepository.java  |  5 ++---
 .../sa4/sanmarinoes/smarthut/models/Condition.java   |  5 +----
 .../sanmarinoes/smarthut/models/RangeCondition.java  |  5 ++---
 .../smarthut/models/RangeConditionRepository.java    |  6 ++----
 8 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
index fac99b5..ddcb880 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
@@ -25,11 +25,11 @@ public class BooleanConditionController {
     @Autowired BooleanConditionRepository booleanConditionRepository;
 
     @GetMapping("/{automationId}")
-    public List> getAll(@PathVariable long automationId) {
+    public List getAll(@PathVariable long automationId) {
         return booleanConditionRepository.findAllByAutomationId(automationId);
     }
 
-    private BooleanCondition save(BooleanCondition newRL, BooleanConditionSaveRequest s) {
+    private BooleanCondition save(BooleanCondition newRL, BooleanConditionSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOn(s.isOn());
@@ -38,13 +38,13 @@ public class BooleanConditionController {
     }
 
     @PostMapping
-    public BooleanCondition create(
+    public BooleanCondition create(
             @Valid @RequestBody BooleanConditionSaveRequest booleanTriggerSaveRequest) {
-        return save(new BooleanCondition<>(), booleanTriggerSaveRequest);
+        return save(new BooleanCondition(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
-    public BooleanCondition update(
+    public BooleanCondition update(
             @Valid @RequestBody BooleanConditionSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
index 25491b0..5055c61 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
@@ -25,11 +25,11 @@ public class RangeConditionController {
     @Autowired RangeConditionRepository rangeConditionRepository;
 
     @GetMapping("/{automationId}")
-    public List> getAll(@PathVariable long automationId) {
+    public List getAll(@PathVariable long automationId) {
         return rangeConditionRepository.findAllByAutomationId(automationId);
     }
 
-    private RangeCondition save(RangeCondition newRL, RangeConditionSaveRequest s) {
+    private RangeCondition save(RangeCondition newRL, RangeConditionSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOperator(s.getOperator());
@@ -39,13 +39,13 @@ public class RangeConditionController {
     }
 
     @PostMapping
-    public RangeCondition create(
+    public RangeCondition create(
             @Valid @RequestBody RangeConditionSaveRequest booleanTriggerSaveRequest) {
-        return save(new RangeCondition<>(), booleanTriggerSaveRequest);
+        return save(new RangeCondition(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
-    public RangeCondition update(
+    public RangeCondition update(
             @Valid @RequestBody RangeConditionSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index 5283ec3..bb90896 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -62,33 +62,33 @@ public class AutomationFastUpdateRequest {
         }
     }
 
-    public abstract class ConditionDTO {
+    public abstract static class ConditionDTO {
         @NotNull public long deviceId;
 
         public abstract Condition toModel();
     }
 
-    public class BooleanConditionDTO extends ConditionDTO {
+    public static class BooleanConditionDTO extends ConditionDTO {
 
         @NotNull public boolean on;
 
         @Override
         public Condition toModel() {
-            BooleanCondition t = new BooleanCondition<>();
+            BooleanCondition t = new BooleanCondition();
             t.setDeviceId(this.deviceId);
             t.setOn(this.on);
             return t;
         }
     }
 
-    public class RangeConditionDTO extends ConditionDTO {
+    public static class RangeConditionDTO extends ConditionDTO {
 
         @NotNull RangeCondition.Operator operator;
         @NotNull double range;
 
         @Override
         public Condition toModel() {
-            RangeCondition t = new RangeCondition<>();
+            RangeCondition t = new RangeCondition();
             t.setDeviceId(this.deviceId);
             t.setOperator(this.operator);
             t.setRange(this.range);
@@ -96,7 +96,7 @@ public class AutomationFastUpdateRequest {
         }
     }
 
-    public class ThermostatConditionDTO extends ConditionDTO {
+    public static class ThermostatConditionDTO extends ConditionDTO {
 
         @NotNull ThermostatCondition.Operator operator;
         @NotNull private Thermostat.Mode mode;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
index 5b3f1e3..22ac7a2 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
@@ -4,8 +4,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @Entity
-public class BooleanCondition
-        extends Condition { // TODO add interface to type constraints
+public class BooleanCondition extends Condition {
 
     @Column(name = "switchable_on")
     private boolean on;
@@ -22,10 +21,6 @@ public class BooleanCondition
         this.on = on;
     }
 
-    public boolean check(boolean on) {
-        return this.on == on;
-    }
-
     @Override
     public boolean triggered() {
         return this.getDevice().readTriggerState() == isOn();
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java
index c564c41..539eb6d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionRepository.java
@@ -3,8 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import java.util.List;
 import org.springframework.data.repository.query.Param;
 
-public interface BooleanConditionRepository
-        extends ConditionRepository> {
+public interface BooleanConditionRepository extends ConditionRepository {
 
-    List> findAllByAutomationId(@Param("automationId") long automationId);
+    List findAllByAutomationId(@Param("automationId") long automationId);
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
index 859730b..08b2db8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
@@ -10,10 +10,9 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
 
 @Entity
-public abstract class Condition {
+public abstract class Condition {
 
     @Transient private String kind;
 
@@ -41,7 +40,6 @@ public abstract class Condition {
      * from a REST call.
      */
     @Column(name = "device_id", nullable = false)
-    @NotNull
     private Long deviceId;
 
     @ManyToOne
@@ -50,7 +48,6 @@ public abstract class Condition {
     private Automation automation;
 
     @Column(name = "automation_id", nullable = false)
-    @NotNull
     private Long automationId;
 
     public abstract boolean triggered();
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
index 7ad1a8d..f3e4bce 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
@@ -7,10 +7,10 @@ import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
 
 @Entity
-public class RangeCondition extends Condition {
+public class RangeCondition extends Condition {
 
     public RangeCondition() {
-        super("booleanCondition");
+        super("rangeCondition");
     }
 
     public enum Operator {
@@ -26,7 +26,6 @@ public class RangeCondition extends Conditi
         GREATER_EQUAL
     }
 
-    @NotNull
     @Column(nullable = false)
     private RangeCondition.Operator operator;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java
index 1ed6aa3..451d4a7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionRepository.java
@@ -3,8 +3,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import java.util.List;
 import org.springframework.data.repository.query.Param;
 
-public interface RangeConditionRepository
-        extends ConditionRepository> {
-
-    List> findAllByAutomationId(@Param("automationId") long automationId);
+public interface RangeConditionRepository extends ConditionRepository {
+    List findAllByAutomationId(@Param("automationId") long automationId);
 }

From 87df96760ddf4003698b123549544f65f2613221 Mon Sep 17 00:00:00 2001
From: Claudio Maggioni 
Date: Tue, 12 May 2020 15:44:32 +0200
Subject: [PATCH 048/176] Added lombok and converted DTOs

---
 build.gradle                                  |  1 +
 lombok.config                                 |  3 ++
 .../smarthut/controller/GuestController.java  |  2 +-
 .../dto/AutomationFastUpdateRequest.java      | 34 +------------
 .../smarthut/dto/AutomationSaveRequest.java   | 16 +-----
 .../dto/BooleanTriggerSaveRequest.java        | 30 +----------
 .../smarthut/dto/ButtonDimmerDimRequest.java  | 18 +------
 .../smarthut/dto/DeviceSaveRequest.java       | 26 +---------
 .../smarthut/dto/DimmableSaveRequest.java     | 34 +------------
 .../dto/DimmableStateSaveRequest.java         | 14 +----
 .../dto/GenericDeviceSaveReguest.java         | 18 +------
 .../smarthut/dto/GuestPermissionsRequest.java | 11 ++--
 .../smarthut/dto/GuestsUpdateRequest.java     |  4 +-
 .../dto/InitPasswordResetRequest.java         | 10 +---
 .../sanmarinoes/smarthut/dto/JWTRequest.java  | 30 +----------
 .../sanmarinoes/smarthut/dto/JWTResponse.java | 13 ++---
 .../smarthut/dto/KnobDimmerDimRequest.java    | 18 +------
 .../smarthut/dto/PasswordResetRequest.java    | 18 +------
 .../smarthut/dto/RangeTriggerSaveRequest.java | 42 +--------------
 .../smarthut/dto/RoomSaveRequest.java         | 34 +------------
 .../dto/ScenePrioritySaveRequest.java         | 26 +---------
 .../smarthut/dto/SceneSaveRequest.java        | 30 +----------
 .../smarthut/dto/SensorSaveRequest.java       | 51 +------------------
 .../smarthut/dto/SwitchOperationRequest.java  | 18 +------
 .../smarthut/dto/SwitchableSaveRequest.java   | 34 +------------
 .../dto/SwitchableStateSaveRequest.java       | 14 +----
 .../smarthut/dto/ThermostatSaveRequest.java   | 50 +-----------------
 .../smarthut/dto/UserRegistrationRequest.java | 34 +------------
 .../smarthut/dto/UserResponse.java            | 16 +-----
 .../smarthut/dto/UserUpdateRequest.java       | 48 -----------------
 30 files changed, 62 insertions(+), 635 deletions(-)
 create mode 100644 lombok.config
 delete mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserUpdateRequest.java

diff --git a/build.gradle b/build.gradle
index 4f04b96..a6f73d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ plugins {
 	id 'java'
 	id 'jacoco'
 	id "org.sonarqube" version "2.8"
+	id 'io.freefair.lombok' version '5.0.1'
 }
 group = 'ch.usi.inf.sa4.sanmarinoes'
 version = '0.0.1-SNAPSHOT'
diff --git a/lombok.config b/lombok.config
new file mode 100644
index 0000000..189c0be
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1,3 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java
index 4b7109d..8212426 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestController.java
@@ -46,7 +46,7 @@ public class GuestController {
     @PutMapping("/guests")
     public List setGuests(
             @RequestBody @Valid GuestsUpdateRequest g, final Principal principal) {
-        Iterable guests = userRepository.findAllById(g.ids);
+        Iterable guests = userRepository.findAllById(g.getIds());
         User host = userRepository.findByUsername(principal.getName());
 
         for (final User oldGuest : host.getGuests()) {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index 58ce46c..1fd45ea 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -8,7 +8,9 @@ import java.util.List;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class AutomationFastUpdateRequest {
     public abstract static class TriggerDTO {
         @NotNull public long deviceId;
@@ -62,36 +64,4 @@ public class AutomationFastUpdateRequest {
     @NotNull private long id;
 
     @NotNull @NotEmpty private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List getScenes() {
-        return scenes;
-    }
-
-    public void setScenes(List scenes) {
-        this.scenes = scenes;
-    }
-
-    public List getTriggers() {
-        return triggers;
-    }
-
-    public void setTriggers(List triggers) {
-        this.triggers = triggers;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java
index bcd1f8b..00f0c07 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java
@@ -2,22 +2,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class AutomationSaveRequest {
-
     private long id;
-
     @NotNull @NotEmpty private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java
index 2c08bc0..8f57b22 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java
@@ -1,7 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class BooleanTriggerSaveRequest {
 
     private long id;
@@ -11,32 +13,4 @@ public class BooleanTriggerSaveRequest {
     @NotNull private Long automationId;
 
     private boolean on;
-
-    public long getId() {
-        return id;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
-    public void setAutomationId(Long automationId) {
-        this.automationId = automationId;
-    }
-
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ButtonDimmerDimRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ButtonDimmerDimRequest.java
index 8e07015..4e15ef5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ButtonDimmerDimRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ButtonDimmerDimRequest.java
@@ -1,8 +1,10 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
 /** A 'dim' event from a button dimmer. */
+@Data
 public class ButtonDimmerDimRequest {
 
     /** The device id */
@@ -15,20 +17,4 @@ public class ButtonDimmerDimRequest {
 
     /** Whether the dim is up or down */
     @NotNull private DimType dimType;
-
-    public DimType getDimType() {
-        return dimType;
-    }
-
-    public void setDimType(DimType dimType) {
-        this.dimType = dimType;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DeviceSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DeviceSaveRequest.java
index a975117..72b9ea7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DeviceSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DeviceSaveRequest.java
@@ -2,7 +2,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class DeviceSaveRequest {
     /** Device identifier */
     private long id;
@@ -15,28 +17,4 @@ public class DeviceSaveRequest {
 
     /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */
     @NotNull @NotEmpty private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableSaveRequest.java
index acefa72..31325c3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableSaveRequest.java
@@ -3,7 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class DimmableSaveRequest {
 
     /** Device id (used only for update requests) */
@@ -23,36 +25,4 @@ public class DimmableSaveRequest {
 
     /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */
     @NotNull private String name;
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Integer getIntensity() {
-        return intensity;
-    }
-
-    public void setIntensity(Integer intensity) {
-        this.intensity = intensity;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableStateSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableStateSaveRequest.java
index ebf99eb..00f875b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableStateSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/DimmableStateSaveRequest.java
@@ -3,7 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class DimmableStateSaveRequest {
 
     /** Device id (used only for update requests) */
@@ -13,16 +15,4 @@ public class DimmableStateSaveRequest {
     @Min(0)
     @Max(100)
     private Integer intensity = 0;
-
-    public Integer getIntensity() {
-        return intensity;
-    }
-
-    public void setIntensity(Integer intensity) {
-        this.intensity = intensity;
-    }
-
-    public Long getId() {
-        return id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveReguest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveReguest.java
index 8ec2671..f3616e3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveReguest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveReguest.java
@@ -1,7 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class GenericDeviceSaveReguest {
     /**
      * The room this device belongs in, as a foreign key id. To use when updating and inserting from
@@ -11,20 +13,4 @@ public class GenericDeviceSaveReguest {
 
     /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */
     @NotNull private String name;
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestPermissionsRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestPermissionsRequest.java
index 8c1a2c4..17da407 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestPermissionsRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestPermissionsRequest.java
@@ -1,13 +1,8 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
+import lombok.Data;
+
+@Data
 public class GuestPermissionsRequest {
     private boolean cameraEnabled;
-
-    public boolean isCameraEnabled() {
-        return cameraEnabled;
-    }
-
-    public void setCameraEnabled(boolean cameraEnabled) {
-        this.cameraEnabled = cameraEnabled;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java
index 6e98937..a4527e7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GuestsUpdateRequest.java
@@ -2,7 +2,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import java.util.List;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class GuestsUpdateRequest {
-    @NotNull public List ids;
+    @NotNull private List ids;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java
index d82c4f0..dca0d79 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java
@@ -3,8 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
+import lombok.Data;
 
 /** DTO for password reset request */
+@Data
 public class InitPasswordResetRequest {
     /**
      * The user's email (validated according to criteria used in >input type="email"<>
@@ -14,12 +16,4 @@ public class InitPasswordResetRequest {
     @Email(message = "Please provide a valid email address")
     @Pattern(regexp = ".+@.+\\..+", message = "Please provide a valid email address")
     private String email;
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java
index da11bc3..48bb386 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java
@@ -1,36 +1,10 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class JWTRequest {
     @NotNull private String usernameOrEmail;
     @NotNull private String password;
-
-    public String getUsernameOrEmail() {
-        return this.usernameOrEmail;
-    }
-
-    public void setUsernameOrEmail(String usernameOrEmail) {
-        this.usernameOrEmail = usernameOrEmail;
-    }
-
-    public String getPassword() {
-        return this.password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String toString() {
-        return "JWTRequest{"
-                + "usernameOrEmail='"
-                + usernameOrEmail
-                + '\''
-                + ", password='"
-                + password
-                + '\''
-                + '}';
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTResponse.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTResponse.java
index 7bc04f2..bf47cc3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTResponse.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTResponse.java
@@ -1,13 +1,10 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
 public class JWTResponse {
     private final String jwttoken;
-
-    public JWTResponse(String jwttoken) {
-        this.jwttoken = jwttoken;
-    }
-
-    public String getToken() {
-        return this.jwttoken;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/KnobDimmerDimRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/KnobDimmerDimRequest.java
index 6df303a..d0a45c8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/KnobDimmerDimRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/KnobDimmerDimRequest.java
@@ -3,7 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class KnobDimmerDimRequest {
 
     /** The device id */
@@ -14,20 +16,4 @@ public class KnobDimmerDimRequest {
     @Min(0)
     @Max(100)
     private Integer intensity;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getIntensity() {
-        return intensity;
-    }
-
-    public void setIntensity(Integer intensity) {
-        this.intensity = intensity;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
index bf5bccf..871b95c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
@@ -1,8 +1,10 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.*;
+import lombok.Data;
 
 /** DTO for password reset request */
+@Data
 public class PasswordResetRequest {
 
     @NotNull private String confirmationToken;
@@ -15,20 +17,4 @@ public class PasswordResetRequest {
             max = 255,
             message = "Your password should be at least 6 characters long and up to 255 chars long")
     private String password;
-
-    public String getConfirmationToken() {
-        return confirmationToken;
-    }
-
-    public void setConfirmationToken(String confirmationToken) {
-        this.confirmationToken = confirmationToken;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
index 567c035..0df49a5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
@@ -2,7 +2,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class RangeTriggerSaveRequest {
 
     private long id;
@@ -14,44 +16,4 @@ public class RangeTriggerSaveRequest {
     @NotNull private RangeTrigger.Operator operator;
 
     @NotNull private double range;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
-    public void setAutomationId(Long automationId) {
-        this.automationId = automationId;
-    }
-
-    public RangeTrigger.Operator getOperator() {
-        return operator;
-    }
-
-    public void setOperator(RangeTrigger.Operator operator) {
-        this.operator = operator;
-    }
-
-    public double getRange() {
-        return range;
-    }
-
-    public void setRange(Double range) {
-        this.range = range;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java
index cf362ac..a4074ab 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java
@@ -3,7 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import javax.persistence.Lob;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class RoomSaveRequest {
 
     /** Room identifier */
@@ -21,36 +23,4 @@ public class RoomSaveRequest {
 
     /** The user given name of this room (e.g. 'Master bedroom') */
     @NotNull private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Icon getIcon() {
-        return icon;
-    }
-
-    public void setIcon(Icon icon) {
-        this.icon = icon;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ScenePrioritySaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ScenePrioritySaveRequest.java
index 14a1873..6f5236b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ScenePrioritySaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ScenePrioritySaveRequest.java
@@ -2,7 +2,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class ScenePrioritySaveRequest {
 
     @NotNull private Long automationId;
@@ -11,28 +13,4 @@ public class ScenePrioritySaveRequest {
     private Integer priority;
 
     @NotNull private Long sceneId;
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
-    public void setAutomationId(Long automationId) {
-        this.automationId = automationId;
-    }
-
-    public Integer getPriority() {
-        return priority;
-    }
-
-    public void setPriority(Integer priority) {
-        this.priority = priority;
-    }
-
-    public Long getSceneId() {
-        return sceneId;
-    }
-
-    public void setSceneId(Long sceneId) {
-        this.sceneId = sceneId;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
index b890536..59e1b2f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
@@ -3,7 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import javax.persistence.Column;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class SceneSaveRequest {
 
     /** Room identifier */
@@ -16,32 +18,4 @@ public class SceneSaveRequest {
 
     /** Determines whether a guest can access this scene */
     @Column @NotNull private boolean guestAccessEnabled;
-
-    public boolean isGuestAccessEnabled() {
-        return guestAccessEnabled;
-    }
-
-    public void setGuestAccessEnabled(boolean guestAccessEnabled) {
-        this.guestAccessEnabled = guestAccessEnabled;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Icon getIcon() {
-        return icon;
-    }
-
-    public void setIcon(Icon icon) {
-        this.icon = icon;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
index 62b0b5e..8566bde 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
@@ -1,29 +1,14 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
-import com.google.gson.annotations.SerializedName;
 import java.math.BigDecimal;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class SensorSaveRequest {
-
-    /** Type of sensor, i.e. of the thing the sensor measures. */
-    public enum SensorType {
-        /** A sensor that measures temperature in degrees celsius */
-        @SerializedName("TEMPERATURE")
-        TEMPERATURE,
-
-        /** A sensor that measures relative humidity in percentage points */
-        @SerializedName("HUMIDITY")
-        HUMIDITY,
-
-        /** A sensor that measures light in degrees */
-        @SerializedName("LIGHT")
-        LIGHT
-    }
-
     /** The type of this sensor */
     @NotNull
     @Enumerated(value = EnumType.STRING)
@@ -39,36 +24,4 @@ public class SensorSaveRequest {
 
     /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */
     @NotNull private String name;
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Sensor.SensorType getSensor() {
-        return sensor;
-    }
-
-    public void setSensor(Sensor.SensorType sensor) {
-        this.sensor = sensor;
-    }
-
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequest.java
index 3fb552b..fa1aed5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequest.java
@@ -1,8 +1,10 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
 /** An on/off/toggle operation on a switch */
+@Data
 public class SwitchOperationRequest {
 
     /** The device id */
@@ -16,20 +18,4 @@ public class SwitchOperationRequest {
 
     /** The type of switch operation */
     @NotNull private SwitchOperationRequest.OperationType type;
-
-    public OperationType getType() {
-        return type;
-    }
-
-    public void setType(OperationType type) {
-        this.type = type;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequest.java
index 16caaed..b2ab2fb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequest.java
@@ -1,7 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class SwitchableSaveRequest {
     /** The state of this switch */
     private boolean on;
@@ -17,36 +19,4 @@ public class SwitchableSaveRequest {
 
     /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */
     @NotNull private String name;
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequest.java
index ab03f27..7a29c02 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequest.java
@@ -1,23 +1,13 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class SwitchableStateSaveRequest {
 
     /** Device id (used only for update requests) */
     @NotNull private Long id;
 
     @NotNull private boolean on;
-
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
-
-    public Long getId() {
-        return id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
index 5ac3402..6bbfbb8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
@@ -2,7 +2,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import java.math.BigDecimal;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class ThermostatSaveRequest {
 
     /** Device identifier */
@@ -24,52 +26,4 @@ public class ThermostatSaveRequest {
 
     /** State of this thermostat */
     @NotNull private boolean turnOn;
-
-    public boolean isTurnOn() {
-        return turnOn;
-    }
-
-    public void setTurnOn(boolean turnOn) {
-        this.turnOn = turnOn;
-    }
-
-    public boolean isUseExternalSensors() {
-        return useExternalSensors;
-    }
-
-    public void setUseExternalSensors(boolean useExternalSensors) {
-        this.useExternalSensors = useExternalSensors;
-    }
-
-    public BigDecimal getTargetTemperature() {
-        return this.targetTemperature;
-    }
-
-    public void setTargetTemperature(BigDecimal targetTemperature) {
-        this.targetTemperature = targetTemperature;
-    }
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequest.java
index 785d408..bf1caa5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequest.java
@@ -1,7 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.*;
+import lombok.Data;
 
+@Data
 public class UserRegistrationRequest {
 
     /** The full name of the user */
@@ -35,36 +37,4 @@ public class UserRegistrationRequest {
     @Email(message = "Please provide a valid email address")
     @Pattern(regexp = ".+@.+\\..+", message = "Please provide a valid email address")
     private String email;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java
index 86314a0..3cc0910 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java
@@ -1,14 +1,14 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import lombok.Data;
 
+@Data
 public class UserResponse {
     private Long id;
     private String username;
     private String name;
 
-    private UserResponse() {}
-
     public static UserResponse fromUser(User u) {
         final UserResponse us = new UserResponse();
         us.name = u.getName();
@@ -16,16 +16,4 @@ public class UserResponse {
         us.username = u.getUsername();
         return us;
     }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getName() {
-        return name;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserUpdateRequest.java
deleted file mode 100644
index 551b84a..0000000
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserUpdateRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
-
-public class UserUpdateRequest {
-    /** The full name of the user */
-    @NotEmpty(message = "Please provide a full name")
-    private String name;
-
-    /** A non-salted password */
-    @NotEmpty(message = "Please provide a password")
-    private String password;
-
-    /**
-     * The user's email (validated according to criteria used in >input type="email"<>
-     * , technically not RFC 5322 compliant
-     */
-    @NotEmpty(message = "Please provide an email")
-    @Email(message = "Please provide a valid email address")
-    @Pattern(regexp = ".+@.+\\..+", message = "Please provide a valid email address")
-    private String email;
-
-    public String getName() {
-        return name;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-}

From 582f44581b80aa876b21f527cb23559b8fc01ddd Mon Sep 17 00:00:00 2001
From: Claudio Maggioni 
Date: Tue, 12 May 2020 16:57:49 +0200
Subject: [PATCH 049/176] More lombok-ification

---
 .../controller/UserAccountController.java     |  4 +-
 .../dto/AutomationFastUpdateRequest.java      | 14 +---
 .../dto/RangeConditionSaveRequest.java        | 43 +---------
 .../smarthut/dto/RangeTriggerSaveRequest.java |  4 +-
 .../smarthut/models/Automation.java           | 46 +---------
 .../smarthut/models/BooleanCondition.java     | 12 +--
 .../smarthut/models/BooleanTrigger.java       | 16 +---
 .../smarthut/models/ButtonDimmer.java         |  1 +
 .../smarthut/models/Condition.java            | 38 +--------
 .../smarthut/models/ConfirmationToken.java    | 45 +---------
 .../sanmarinoes/smarthut/models/Device.java   | 84 +------------------
 .../sanmarinoes/smarthut/models/Dimmable.java | 15 ++--
 .../smarthut/models/DimmableState.java        | 12 +--
 .../sanmarinoes/smarthut/models/Dimmer.java   |  2 +-
 .../smarthut/models/MotionSensor.java         | 12 +--
 .../sanmarinoes/smarthut/models/Operator.java | 33 ++++++++
 .../smarthut/models/RangeCondition.java       | 56 ++-----------
 .../smarthut/models/RangeTrigger.java         | 55 ++----------
 .../smarthut/models/RegularLight.java         | 15 +---
 19 files changed, 99 insertions(+), 408 deletions(-)
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Operator.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
index fe5d6fd..b1648ed 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
@@ -158,7 +158,7 @@ public class UserAccountController {
         final ConfirmationToken token =
                 confirmationTokenRepository.findByConfirmToken(resetRequest.getConfirmationToken());
 
-        if (token == null || !token.getResetPassword()) {
+        if (token == null || !token.isResetPassword()) {
             throw new EmailTokenNotFoundException();
         }
 
@@ -186,7 +186,7 @@ public class UserAccountController {
         final ConfirmationToken token =
                 confirmationTokenRepository.findByConfirmToken(confirmationToken);
 
-        if (token != null && !token.getResetPassword()) {
+        if (token != null && !token.isResetPassword()) {
             token.getUser().setEnabled(true);
             userRepository.save(token.getUser());
             response.sendRedirect(emailConfig.getRegistrationRedirect());
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index 0861429..4217761 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -1,14 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.util.List;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
@@ -36,7 +28,7 @@ public class AutomationFastUpdateRequest {
     }
 
     public static class RangeTriggerDTO extends TriggerDTO {
-        @NotNull RangeTrigger.Operator operator;
+        @NotNull Operator operator;
         @NotNull double range;
 
         @Override
@@ -85,7 +77,7 @@ public class AutomationFastUpdateRequest {
 
     public static class RangeConditionDTO extends ConditionDTO {
 
-        @NotNull RangeCondition.Operator operator;
+        @NotNull Operator operator;
         @NotNull double range;
 
         @Override
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java
index 8cf4bf6..65fb3e4 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java
@@ -1,9 +1,10 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition.Operator;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class RangeConditionSaveRequest {
 
     @NotNull private long id;
@@ -12,43 +13,7 @@ public class RangeConditionSaveRequest {
 
     @NotNull private Long automationId;
 
-    @NotNull private RangeCondition.Operator operator;
+    @NotNull private Operator operator;
 
     @NotNull private double range;
-
-    public long getId() {
-        return id;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
-    public void setAutomationId(Long automationId) {
-        this.automationId = automationId;
-    }
-
-    public Operator getOperator() {
-        return operator;
-    }
-
-    public void setOperator(Operator operator) {
-        this.operator = operator;
-    }
-
-    public double getRange() {
-        return range;
-    }
-
-    public void setRange(double range) {
-        this.range = range;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
index 0df49a5..8c43ce6 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ public class RangeTriggerSaveRequest {
 
     @NotNull private Long automationId;
 
-    @NotNull private RangeTrigger.Operator operator;
+    @NotNull private Operator operator;
 
     @NotNull private double range;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
index f711c93..48a9e44 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
@@ -7,7 +7,9 @@ import java.util.Set;
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 @Entity
 public class Automation {
 
@@ -37,48 +39,4 @@ public class Automation {
     private Set> conditions = new HashSet<>();
 
     @NotNull @NotEmpty private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Set getScenes() {
-        return scenes;
-    }
-
-    public Set> getTriggers() {
-        return triggers;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Set> getConditions() {
-        return conditions;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
index 22ac7a2..4097c26 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
@@ -2,10 +2,14 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 public class BooleanCondition extends Condition {
 
+    @Getter
+    @Setter
     @Column(name = "switchable_on")
     private boolean on;
 
@@ -13,14 +17,6 @@ public class BooleanCondition extends Condition {
         super("booleanCondition");
     }
 
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
-
     @Override
     public boolean triggered() {
         return this.getDevice().readTriggerState() == isOn();
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java
index 6eeb69e..50a86b1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTrigger.java
@@ -2,29 +2,21 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 public class BooleanTrigger extends Trigger {
 
     @Column(name = "switchable_on")
+    @Getter
+    @Setter
     private boolean on;
 
     public BooleanTrigger() {
         super("booleanTrigger");
     }
 
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
-
-    public boolean check(boolean on) {
-        return this.on == on;
-    }
-
     @Override
     public boolean triggered() {
         return getDevice().readTriggerState() == isOn();
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
index e41265a..9759251 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
@@ -1,5 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
+
 import javax.persistence.Entity;
 
 /**
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
index 08b2db8..a063ca6 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
@@ -10,7 +10,9 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
+import lombok.Data;
 
+@Data
 @Entity
 public abstract class Condition {
 
@@ -52,42 +54,6 @@ public abstract class Condition {
 
     public abstract boolean triggered();
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public D getDevice() {
-        return device;
-    }
-
-    public void setDevice(D device) {
-        this.device = device;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Automation getAutomation() {
-        return automation;
-    }
-
-    public void setAutomation(Automation automation) {
-        this.automation = automation;
-    }
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
     public Condition setAutomationId(Long automationId) {
         this.automationId = automationId;
         return this;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index a661aa0..0bc1213 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -12,7 +12,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import lombok.Data;
 
+@Data
 @Entity
 public class ConfirmationToken {
 
@@ -40,47 +42,4 @@ public class ConfirmationToken {
         confirmToken = UUID.randomUUID().toString();
         resetPassword = false;
     }
-
-    /** Constructor for hibernate reflective stuff things whatever */
-    public ConfirmationToken() {}
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getConfirmToken() {
-        return confirmToken;
-    }
-
-    public Date getCreatedDate() {
-        return (Date) createdDate.clone();
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setConfirmToken(String confirmToken) {
-        this.confirmToken = confirmToken;
-    }
-
-    public void setCreatedDate(Date createdDate) {
-        this.createdDate = (Date) createdDate.clone();
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public boolean getResetPassword() {
-        return resetPassword;
-    }
-
-    public void setResetPassword(boolean resetPassword) {
-        this.resetPassword = resetPassword;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
index ebaf4b0..bc16615 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
@@ -6,9 +6,11 @@ import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.Data;
 
 /** Generic abstraction for a smart home device */
 @Entity
+@Data
 @Inheritance(strategy = InheritanceType.JOINED)
 public abstract class Device {
 
@@ -73,88 +75,8 @@ public abstract class Device {
 
     @Transient @GsonExclude private boolean deleted = false;
 
-    public Device(String kind, FlowType flowType) {
+    protected Device(String kind, FlowType flowType) {
         this.kind = kind;
         this.flowType = flowType;
     }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Room getRoom() {
-        return room;
-    }
-
-    public void setRoom(Room room) {
-        this.room = room;
-    }
-
-    public Set> getTriggers() {
-        return triggers;
-    }
-
-    public void setTriggers(Set> triggers) {
-        this.triggers = triggers;
-    }
-
-    public Long getRoomId() {
-        return roomId;
-    }
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getKind() {
-        return kind;
-    }
-
-    public FlowType getFlowType() {
-        return flowType;
-    }
-
-    public Set> getStates() {
-        return states;
-    }
-
-    public void setStates(Set> states) {
-        this.states = states;
-    }
-
-    public Long getFromHostId() {
-        return fromHostId;
-    }
-
-    public void setFromHostId(Long fromHostId) {
-        this.fromHostId = fromHostId;
-    }
-
-    public boolean isFromGuest() {
-        return fromGuest;
-    }
-
-    public void setFromGuest(boolean fromGuest) {
-        this.fromGuest = fromGuest;
-    }
-
-    public boolean isDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.deleted = deleted;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
index bc093e0..a440e37 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
@@ -7,6 +7,8 @@ import javax.persistence.*;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@@ -19,6 +21,8 @@ public class Dimmable extends Switchable implements RangeTriggerable {
     @ManyToMany(mappedBy = "dimmables", cascade = CascadeType.DETACH)
     @GsonExclude
     @SocketGsonExclude
+    @Getter
+    @Setter
     private Set dimmers;
 
     /** The light intensity value. Goes from 0 (off) to 100 (on) */
@@ -26,16 +30,15 @@ public class Dimmable extends Switchable implements RangeTriggerable {
     @Column(nullable = false)
     @Min(0)
     @Max(100)
+    @Getter
     private Integer intensity = 0;
 
     @NotNull
     @Column(nullable = false)
+    @Getter
+    @Setter
     private Integer oldIntensity = 100;
 
-    public Integer getIntensity() {
-        return intensity;
-    }
-
     /**
      * Sets the intensity to a certain level. Out of bound values are corrected to the respective
      * extremums. An intensity level of 0 turns the light off, but keeps the old intensity level
@@ -65,10 +68,6 @@ public class Dimmable extends Switchable implements RangeTriggerable {
         intensity = on ? oldIntensity : 0;
     }
 
-    public Set getDimmers() {
-        return this.dimmers;
-    }
-
     public void readStateAndSet(DimmableState state) {
         setIntensity(state.getIntensity());
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java
index dff0143..e004c1f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java
@@ -3,6 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import javax.persistence.Entity;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import lombok.Getter;
+import lombok.Setter;
 
 /** Represent a state for an IDimmable device */
 @Entity
@@ -11,16 +13,10 @@ public class DimmableState extends State {
     /** The light intensity value. Goes from 0 (off) to 100 (on) */
     @Min(0)
     @Max(100)
+    @Getter
+    @Setter
     private int intensity = 0;
 
-    public int getIntensity() {
-        return intensity;
-    }
-
-    public void setIntensity(int dimAmount) {
-        this.intensity = dimAmount;
-    }
-
     @Override
     public void apply() {
         getDevice().readStateAndSet(this);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
index cd3ee64..109e13e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
@@ -10,7 +10,7 @@ import javax.persistence.*;
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class Dimmer extends InputDevice implements Connectable {
-    public Dimmer(String kind) {
+    protected Dimmer(String kind) {
         super(kind);
     }
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
index 4998922..122a608 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
@@ -2,22 +2,18 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
 
 /** Represents a motion sensor device */
 @Entity
 public class MotionSensor extends InputDevice implements BooleanTriggerable {
 
+    @Getter
+    @Setter
     @Column(nullable = false)
     private boolean detected;
 
-    public boolean isDetected() {
-        return detected;
-    }
-
-    public void setDetected(boolean detected) {
-        this.detected = detected;
-    }
-
     public MotionSensor() {
         super("motionSensor");
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Operator.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Operator.java
new file mode 100644
index 0000000..3c255f2
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Operator.java
@@ -0,0 +1,33 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
+
+import com.google.gson.annotations.SerializedName;
+
+public enum Operator {
+    @SerializedName("EQUAL")
+    EQUAL,
+    @SerializedName("LESS")
+    LESS,
+    @SerializedName("GREATER")
+    GREATER,
+    @SerializedName("LESS_EQUAL")
+    LESS_EQUAL,
+    @SerializedName("GREATER_EQUAL")
+    GREATER_EQUAL;
+
+    boolean checkAgainst(double value, double range) {
+        switch (this) {
+            case EQUAL:
+                return value == range;
+            case LESS:
+                return value < range;
+            case GREATER:
+                return value > range;
+            case GREATER_EQUAL:
+                return value >= range;
+            case LESS_EQUAL:
+                return value <= range;
+            default:
+                throw new IllegalStateException();
+        }
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
index f3e4bce..f79cd94 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
@@ -1,10 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger.Operator;
-import com.google.gson.annotations.SerializedName;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 public class RangeCondition extends Condition {
@@ -13,57 +12,18 @@ public class RangeCondition extends Condition {
         super("rangeCondition");
     }
 
-    public enum Operator {
-        @SerializedName("EQUAL")
-        EQUAL,
-        @SerializedName("LESS")
-        LESS,
-        @SerializedName("GREATER")
-        GREATER,
-        @SerializedName("LESS_EQUAL")
-        LESS_EQUAL,
-        @SerializedName("GREATER_EQUAL")
-        GREATER_EQUAL
-    }
-
+    @Getter
+    @Setter
     @Column(nullable = false)
-    private RangeCondition.Operator operator;
+    private Operator operator;
 
-    @NotNull
+    @Getter
+    @Setter
     @Column(nullable = false)
     private double range;
 
-    public RangeCondition.Operator getOperator() {
-        return operator;
-    }
-
-    public void setOperator(RangeCondition.Operator operator) {
-        this.operator = operator;
-    }
-
-    public double getRange() {
-        return range;
-    }
-
-    public void setRange(Double range) {
-        this.range = range;
-    }
-
     @Override
     public boolean triggered() {
-        double value = getDevice().readTriggerState();
-        switch (operator) {
-            case EQUAL:
-                return value == range;
-            case LESS:
-                return value < range;
-            case GREATER:
-                return value > range;
-            case GREATER_EQUAL:
-                return value >= range;
-            case LESS_EQUAL:
-                return value <= range;
-        }
-        throw new IllegalStateException();
+        return operator.checkAgainst(getDevice().readTriggerState(), range);
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
index 0d926ae..2450616 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
@@ -1,8 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import com.google.gson.annotations.SerializedName;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 public class RangeTrigger extends Trigger {
@@ -11,56 +12,18 @@ public class RangeTrigger extends Trigger {
         super("rangeTrigger");
     }
 
-    @Override
-    public boolean triggered() {
-        double value = getDevice().readTriggerState();
-        switch (operator) {
-            case EQUAL:
-                return value == range;
-            case LESS:
-                return value < range;
-            case GREATER:
-                return value > range;
-            case GREATER_EQUAL:
-                return value >= range;
-            case LESS_EQUAL:
-                return value <= range;
-        }
-        throw new IllegalStateException();
-    }
-
-    public enum Operator {
-        @SerializedName("EQUAL")
-        EQUAL,
-        @SerializedName("LESS")
-        LESS,
-        @SerializedName("GREATER")
-        GREATER,
-        @SerializedName("LESS_EQUAL")
-        LESS_EQUAL,
-        @SerializedName("GREATER_EQUAL")
-        GREATER_EQUAL
-    }
-
+    @Getter
+    @Setter
     @Column(nullable = false)
     private Operator operator;
 
+    @Getter
+    @Setter
     @Column(nullable = false)
     private double range;
 
-    public Operator getOperator() {
-        return operator;
-    }
-
-    public void setOperator(Operator operator) {
-        this.operator = operator;
-    }
-
-    public double getRange() {
-        return range;
-    }
-
-    public void setRange(Double range) {
-        this.range = range;
+    @Override
+    public boolean triggered() {
+        return operator.checkAgainst(getDevice().readTriggerState(), range);
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
index 2d06c59..d035b19 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
@@ -3,6 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
 
 /** Represents a standard non-dimmable light */
 @Entity
@@ -11,21 +13,12 @@ public class RegularLight extends Switchable implements BooleanTriggerable {
     /** Whether the light is on or not */
     @Column(name = "light_on", nullable = false)
     @NotNull
+    @Getter
+    @Setter
     boolean on;
 
     public RegularLight() {
         super("regularLight");
-        this.on = false;
-    }
-
-    @Override
-    public boolean isOn() {
-        return on;
-    }
-
-    @Override
-    public void setOn(boolean on) {
-        this.on = on;
     }
 
     @Override

From 0d10d759a6bc5485d715637eb42f9e4f1bb5614f Mon Sep 17 00:00:00 2001
From: Claudio Maggioni 
Date: Tue, 12 May 2020 17:14:25 +0200
Subject: [PATCH 050/176] Removed @NotNull from models

---
 .../usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java   | 4 +---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java  | 3 ---
 .../usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java | 2 --
 .../java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java | 3 ---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java     | 4 ----
 .../inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java    | 2 --
 .../inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java   | 2 --
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java | 2 --
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java     | 3 ---
 .../usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java   | 3 +--
 10 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
index 48a9e44..cb04e9d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
@@ -6,7 +6,6 @@ import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
@@ -24,7 +23,6 @@ public class Automation {
     @GsonExclude
     private User user;
 
-    @NotNull
     @Column(name = "user_id", nullable = false)
     @GsonExclude
     private Long userId;
@@ -38,5 +36,5 @@ public class Automation {
     @OneToMany(mappedBy = "automation", orphanRemoval = true, cascade = CascadeType.REMOVE)
     private Set> conditions = new HashSet<>();
 
-    @NotNull @NotEmpty private String name;
+    @NotEmpty private String name;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
index a440e37..37f40e1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
@@ -6,7 +6,6 @@ import java.util.Set;
 import javax.persistence.*;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -26,14 +25,12 @@ public class Dimmable extends Switchable implements RangeTriggerable {
     private Set dimmers;
 
     /** The light intensity value. Goes from 0 (off) to 100 (on) */
-    @NotNull
     @Column(nullable = false)
     @Min(0)
     @Max(100)
     @Getter
     private Integer intensity = 0;
 
-    @NotNull
     @Column(nullable = false)
     @Getter
     @Setter
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
index d035b19..feac0fb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
@@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +11,6 @@ public class RegularLight extends Switchable implements BooleanTriggerable {
 
     /** Whether the light is on or not */
     @Column(name = "light_on", nullable = false)
-    @NotNull
     @Getter
     @Setter
     boolean on;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java
index 9e3ebc9..6785d90 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 
 /** Represents a room in the house owned by the user */
 @Entity
@@ -42,12 +41,10 @@ public class Room {
      * User that owns the house this room is in as a foreign key id. To use when updating and
      * inserting from a REST call.
      */
-    @NotNull
     @Column(name = "user_id", nullable = false)
     private Long userId;
 
     /** The user given name of this room (e.g. 'Master bedroom') */
-    @NotNull
     @Column(nullable = false)
     private String name;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java
index 83a9367..63cccb4 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 
 /**
  * Represent a collection of state changes to devices even in different rooms but belonging to the
@@ -25,7 +24,6 @@ public class Scene {
     @GsonExclude
     private User user;
 
-    @NotNull
     @Column(name = "user_id", nullable = false)
     @GsonExclude
     private Long userId;
@@ -35,12 +33,10 @@ public class Scene {
     private Set> states = new HashSet<>();
 
     /** The user given name of this room (e.g. 'Master bedroom') */
-    @NotNull
     @Column(nullable = false)
     private String name;
 
     @Column(nullable = false)
-    @NotNull
     private Icon icon;
 
     /** Determines whether a guest can access this scene */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
index e975d08..8363853 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
@@ -11,7 +11,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PreRemove;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 @Entity
 public class ScenePriority {
@@ -30,7 +29,6 @@ public class ScenePriority {
     @Column(name = "automation_id", nullable = false)
     private Long automationId;
 
-    @NotNull
     @Min(0)
     @Column(nullable = false)
     private Integer priority;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
index 218ba4a..ccb1224 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
@@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
 
 @Entity
 public class SecurityCamera extends Switchable implements BooleanTriggerable {
@@ -13,7 +12,6 @@ public class SecurityCamera extends Switchable implements BooleanTriggerable {
     }
 
     @Column(name = "camera_on", nullable = false)
-    @NotNull
     private boolean on;
 
     @Column(name = "video", nullable = false)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
index 10fcacf..b69e3e7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
@@ -3,7 +3,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import java.math.BigDecimal;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
 
 /** A smart plug that can be turned either on or off */
 @Entity
@@ -14,7 +13,6 @@ public class SmartPlug extends Switchable implements BooleanTriggerable {
 
     /** The total amount of power that the smart plug has consumed represented in W/h */
     @Column(precision = 13, scale = 3)
-    @NotNull
     private BigDecimal totalConsumption = BigDecimal.ZERO;
 
     /** Whether the smart plug is on */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java
index 31cd69c..8637500 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java
@@ -3,7 +3,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import io.swagger.annotations.ApiModelProperty;
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 
 /**
  * Represents instructions on how to change the state of a particular device. Many states (plus
@@ -30,7 +29,6 @@ public abstract class State {
      * from a REST call.
      */
     @Column(name = "device_id", nullable = false)
-    @NotNull
     private Long deviceId;
 
     @ManyToOne
@@ -39,7 +37,6 @@ public abstract class State {
     private Scene scene;
 
     @Column(name = "scene_id", nullable = false)
-    @NotNull
     private Long sceneId;
 
     /** Sets the state of the connected device to the state represented by this object. */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
index abcc1cb..a2a71a1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
@@ -5,7 +5,6 @@ import java.math.BigDecimal;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
 
 /** A thermostat capable of controlling cooling and heating. */
 @Entity
@@ -72,7 +71,7 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
             Sensor.TYPICAL_VALUES.get(Sensor.SensorType.TEMPERATURE);
 
     /** State of this thermostat */
-    @Column @NotNull private Thermostat.Mode mode;
+    @Column private Thermostat.Mode mode;
 
     @Transient private BigDecimal measuredTemperature;
 

From 6223434979bbd2b29f5ab1fdc7a408343305d856 Mon Sep 17 00:00:00 2001
From: Claudio Maggioni 
Date: Tue, 12 May 2020 17:20:19 +0200
Subject: [PATCH 051/176] Removed duplication

---
 .../BooleanConditionController.java           |  8 ++--
 .../controller/BooleanTriggerController.java  |  8 ++--
 .../controller/RangeConditionController.java  |  8 ++--
 .../controller/RangeTriggerController.java    |  8 ++--
 ...BooleanConditionOrTriggerSaveRequest.java} |  2 +-
 .../dto/BooleanConditionSaveRequest.java      | 42 -------------------
 ...> RangeConditionOrTriggerSaveRequest.java} |  2 +-
 .../dto/RangeConditionSaveRequest.java        | 19 ---------
 8 files changed, 18 insertions(+), 79 deletions(-)
 rename src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/{BooleanTriggerSaveRequest.java => BooleanConditionOrTriggerSaveRequest.java} (82%)
 delete mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java
 rename src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/{RangeTriggerSaveRequest.java => RangeConditionOrTriggerSaveRequest.java} (87%)
 delete mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
index ddcb880..e605043 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanConditionSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanConditionOrTriggerSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanConditionRepository;
@@ -29,7 +29,7 @@ public class BooleanConditionController {
         return booleanConditionRepository.findAllByAutomationId(automationId);
     }
 
-    private BooleanCondition save(BooleanCondition newRL, BooleanConditionSaveRequest s) {
+    private BooleanCondition save(BooleanCondition newRL, BooleanConditionOrTriggerSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOn(s.isOn());
@@ -39,13 +39,13 @@ public class BooleanConditionController {
 
     @PostMapping
     public BooleanCondition create(
-            @Valid @RequestBody BooleanConditionSaveRequest booleanTriggerSaveRequest) {
+            @Valid @RequestBody BooleanConditionOrTriggerSaveRequest booleanTriggerSaveRequest) {
         return save(new BooleanCondition(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
     public BooleanCondition update(
-            @Valid @RequestBody BooleanConditionSaveRequest booleanTriggerSaveRequest)
+            @Valid @RequestBody BooleanConditionOrTriggerSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
                 booleanConditionRepository
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
index 46af99e..d31b8e2 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanTriggerSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanConditionOrTriggerSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTriggerRepository;
@@ -29,7 +29,7 @@ public class BooleanTriggerController {
         return booleanTriggerRepository.findAllByAutomationId(automationId);
     }
 
-    private BooleanTrigger save(BooleanTrigger newRL, BooleanTriggerSaveRequest s) {
+    private BooleanTrigger save(BooleanTrigger newRL, BooleanConditionOrTriggerSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOn(s.isOn());
@@ -39,13 +39,13 @@ public class BooleanTriggerController {
 
     @PostMapping
     public BooleanTrigger create(
-            @Valid @RequestBody BooleanTriggerSaveRequest booleanTriggerSaveRequest) {
+            @Valid @RequestBody BooleanConditionOrTriggerSaveRequest booleanTriggerSaveRequest) {
         return save(new BooleanTrigger(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
     public BooleanTrigger update(
-            @Valid @RequestBody BooleanTriggerSaveRequest booleanTriggerSaveRequest)
+            @Valid @RequestBody BooleanConditionOrTriggerSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
                 booleanTriggerRepository
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
index 5055c61..ea9a911 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeConditionSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeConditionOrTriggerSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeConditionRepository;
@@ -29,7 +29,7 @@ public class RangeConditionController {
         return rangeConditionRepository.findAllByAutomationId(automationId);
     }
 
-    private RangeCondition save(RangeCondition newRL, RangeConditionSaveRequest s) {
+    private RangeCondition save(RangeCondition newRL, RangeConditionOrTriggerSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOperator(s.getOperator());
@@ -40,13 +40,13 @@ public class RangeConditionController {
 
     @PostMapping
     public RangeCondition create(
-            @Valid @RequestBody RangeConditionSaveRequest booleanTriggerSaveRequest) {
+            @Valid @RequestBody RangeConditionOrTriggerSaveRequest booleanTriggerSaveRequest) {
         return save(new RangeCondition(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
     public RangeCondition update(
-            @Valid @RequestBody RangeConditionSaveRequest booleanTriggerSaveRequest)
+            @Valid @RequestBody RangeConditionOrTriggerSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
                 rangeConditionRepository
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
index a86a386..c8c5589 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeTriggerSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeConditionOrTriggerSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTriggerRepository;
@@ -29,7 +29,7 @@ public class RangeTriggerController {
         return rangeTriggerRepository.findAllByAutomationId(automationId);
     }
 
-    private RangeTrigger save(RangeTrigger newRL, RangeTriggerSaveRequest s) {
+    private RangeTrigger save(RangeTrigger newRL, RangeConditionOrTriggerSaveRequest s) {
         newRL.setDeviceId(s.getDeviceId());
         newRL.setAutomationId(s.getAutomationId());
         newRL.setOperator(s.getOperator());
@@ -40,13 +40,13 @@ public class RangeTriggerController {
 
     @PostMapping
     public RangeTrigger create(
-            @Valid @RequestBody RangeTriggerSaveRequest booleanTriggerSaveRequest) {
+            @Valid @RequestBody RangeConditionOrTriggerSaveRequest booleanTriggerSaveRequest) {
         return save(new RangeTrigger(), booleanTriggerSaveRequest);
     }
 
     @PutMapping
     public RangeTrigger update(
-            @Valid @RequestBody RangeTriggerSaveRequest booleanTriggerSaveRequest)
+            @Valid @RequestBody RangeConditionOrTriggerSaveRequest booleanTriggerSaveRequest)
             throws NotFoundException {
         return save(
                 rangeTriggerRepository
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionOrTriggerSaveRequest.java
similarity index 82%
rename from src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java
rename to src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionOrTriggerSaveRequest.java
index 8f57b22..de5b4c6 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanTriggerSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionOrTriggerSaveRequest.java
@@ -4,7 +4,7 @@ import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
-public class BooleanTriggerSaveRequest {
+public class BooleanConditionOrTriggerSaveRequest {
 
     private long id;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java
deleted file mode 100644
index 2abf6e0..0000000
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/BooleanConditionSaveRequest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
-
-import javax.validation.constraints.NotNull;
-
-public class BooleanConditionSaveRequest {
-
-    @NotNull private long id;
-
-    @NotNull private Long deviceId;
-
-    @NotNull private Long automationId;
-
-    @NotNull private boolean on;
-
-    public long getId() {
-        return id;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
-    public void setAutomationId(Long automationId) {
-        this.automationId = automationId;
-    }
-
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
-}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionOrTriggerSaveRequest.java
similarity index 87%
rename from src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
rename to src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionOrTriggerSaveRequest.java
index 8c43ce6..a222202 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeTriggerSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionOrTriggerSaveRequest.java
@@ -5,7 +5,7 @@ import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
-public class RangeTriggerSaveRequest {
+public class RangeConditionOrTriggerSaveRequest {
 
     private long id;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java
deleted file mode 100644
index 65fb3e4..0000000
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RangeConditionSaveRequest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
-
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-
-@Data
-public class RangeConditionSaveRequest {
-
-    @NotNull private long id;
-
-    @NotNull private Long deviceId;
-
-    @NotNull private Long automationId;
-
-    @NotNull private Operator operator;
-
-    @NotNull private double range;
-}

From acec5a0af8eab50dce576207465660f5c54c07af Mon Sep 17 00:00:00 2001
From: Claudio Maggioni 
Date: Tue, 12 May 2020 18:32:23 +0200
Subject: [PATCH 052/176] Degenerified states

---
 .../controller/CurtainsController.java        |  6 +-
 .../controller/DimmableLightController.java   |  8 +-
 .../controller/DimmableStateController.java   |  4 +-
 .../controller/RegularLightController.java    |  8 +-
 .../smarthut/controller/SceneController.java  |  8 +-
 .../controller/SecurityCameraController.java  |  8 +-
 .../controller/SmartPlugController.java       |  6 +-
 .../controller/SwitchableStateController.java |  4 +-
 .../controller/ThermostatController.java      |  6 +-
 .../sanmarinoes/smarthut/models/Device.java   |  2 +-
 .../sanmarinoes/smarthut/models/Dimmable.java |  8 +-
 .../smarthut/models/DimmableState.java        | 12 ++-
 .../models/DimmableStateRepository.java       |  2 +-
 .../smarthut/models/OutputDevice.java         |  8 +-
 .../sanmarinoes/smarthut/models/Scene.java    | 60 +-------------
 .../sanmarinoes/smarthut/models/State.java    | 79 +++++++------------
 .../smarthut/models/StateRepository.java      |  2 +-
 .../smarthut/models/Switchable.java           |  8 +-
 .../smarthut/models/SwitchableState.java      | 24 +++---
 .../models/SwitchableStateRepository.java     |  2 +-
 .../smarthut/service/SceneService.java        | 12 +--
 21 files changed, 99 insertions(+), 178 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java
index 9fbf704..5e01f9a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsController.java
@@ -18,7 +18,7 @@ public class CurtainsController {
     @Autowired private DeviceService deviceService;
     @Autowired private CurtainsRepository curtainsService;
     @Autowired private SceneRepository sceneRepository;
-    @Autowired private StateRepository> stateRepository;
+    @Autowired private StateRepository stateRepository;
 
     private Curtains save(Curtains newRL, DimmableSaveRequest s, final Principal principal) {
         newRL.setName(s.getName());
@@ -53,7 +53,7 @@ public class CurtainsController {
     }
 
     @PostMapping("/{id}/state")
-    public State sceneBinding(
+    public State sceneBinding(
             @PathVariable("id") long deviceId,
             @RequestParam long sceneId,
             final Principal principal)
@@ -63,7 +63,7 @@ public class CurtainsController {
                 curtainsService
                         .findByIdAndUsername(deviceId, principal.getName())
                         .orElseThrow(NotFoundException::new);
-        State s = c.cloneState();
+        State s = c.cloneState();
         final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new);
         s.setSceneId(sc.getId());
         if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java
index 990c105..e251d7c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java
@@ -18,7 +18,7 @@ public class DimmableLightController extends GuestEnabledController> stateRepository;
+    private final StateRepository stateRepository;
     private final DeviceService deviceService;
 
     @Autowired
@@ -26,7 +26,7 @@ public class DimmableLightController extends GuestEnabledController> stateRepository,
+            StateRepository stateRepository,
             DeviceService deviceService) {
         super(userRepository, dimmableLightRepository);
         this.dimmableLightRepository = dimmableLightRepository;
@@ -87,7 +87,7 @@ public class DimmableLightController extends GuestEnabledController sceneBinding(
+    public State sceneBinding(
             @PathVariable("id") long deviceId,
             @RequestParam long sceneId,
             final Principal principal)
@@ -97,7 +97,7 @@ public class DimmableLightController extends GuestEnabledController s = d.cloneState();
+        State s = d.cloneState();
         final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new);
         s.setSceneId(sc.getId());
         if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateController.java
index d866d78..83ffb53 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateController.java
@@ -17,9 +17,9 @@ public class DimmableStateController {
     @Autowired private DimmableStateRepository dimmableStateRepository;
 
     @PutMapping
-    public DimmableState update(@Valid @RequestBody DimmableStateSaveRequest ss)
+    public DimmableState update(@Valid @RequestBody DimmableStateSaveRequest ss)
             throws NotFoundException {
-        final DimmableState initial =
+        final DimmableState initial =
                 dimmableStateRepository.findById(ss.getId()).orElseThrow(NotFoundException::new);
         initial.setIntensity(ss.getIntensity());
         dimmableStateRepository.save(initial);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
index c3bdc8b..6da88d8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
@@ -29,7 +29,7 @@ public class RegularLightController extends GuestEnabledController
 
     private RegularLightRepository regularLightRepository;
     private SceneRepository sceneRepository;
-    private StateRepository> stateRepository;
+    private StateRepository stateRepository;
     private DeviceService deviceService;
 
     @Autowired
@@ -37,7 +37,7 @@ public class RegularLightController extends GuestEnabledController
             UserRepository userRepository,
             RegularLightRepository regularLightRepository,
             SceneRepository sceneRepository,
-            StateRepository> stateRepository,
+            StateRepository stateRepository,
             DeviceService deviceService) {
         super(userRepository, regularLightRepository);
         this.regularLightRepository = regularLightRepository;
@@ -98,7 +98,7 @@ public class RegularLightController extends GuestEnabledController
     }
 
     @PostMapping("/{id}/state")
-    public State sceneBinding(
+    public State sceneBinding(
             @PathVariable("id") long deviceId,
             @RequestParam long sceneId,
             final Principal principal)
@@ -107,7 +107,7 @@ public class RegularLightController extends GuestEnabledController
                 regularLightRepository
                         .findByIdAndUsername(deviceId, principal.getName())
                         .orElseThrow(NotFoundException::new);
-        State s = d.cloneState();
+        State s = d.cloneState();
         final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new);
         s.setSceneId(sc.getId());
         if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java
index f2d0795..4db036f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneController.java
@@ -22,7 +22,7 @@ public class SceneController {
     @Autowired private SceneRepository sceneRepository;
     @Autowired private UserRepository userRepository;
     @Autowired private SceneService sceneService;
-    @Autowired private StateRepository> stateRepository;
+    @Autowired private StateRepository stateRepository;
 
     @GetMapping
     public List findAll(
@@ -78,7 +78,7 @@ public class SceneController {
     }
 
     @PostMapping("/{id}/copyFrom/{copyId}")
-    public @ResponseBody List> copy(
+    public @ResponseBody List copy(
             @PathVariable("id") long id,
             @PathVariable("copyId") long copyId,
             final Principal principal)
@@ -126,8 +126,8 @@ public class SceneController {
      * id).
      */
     @GetMapping(path = "/{sceneId}/states")
-    public List> getDevices(@PathVariable("sceneId") long sceneId) {
-        Iterable> states = stateRepository.findBySceneId(sceneId);
+    public List getStates(@PathVariable("sceneId") long sceneId) {
+        Iterable states = stateRepository.findBySceneId(sceneId);
         return toList(states);
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
index d006879..781b46a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
@@ -26,7 +26,7 @@ public class SecurityCameraController {
     private final DeviceService deviceService;
     private final SecurityCameraRepository securityCameraService;
     private final SceneRepository sceneRepository;
-    private final StateRepository> stateRepository;
+    private final StateRepository stateRepository;
     private final CameraConfigurationService cameraConfigurationService;
 
     @Autowired
@@ -34,7 +34,7 @@ public class SecurityCameraController {
             DeviceService deviceService,
             SecurityCameraRepository securityCameraService,
             SceneRepository sceneRepository,
-            StateRepository> stateRepository,
+            StateRepository stateRepository,
             CameraConfigurationService cameraConfigurationService) {
         this.deviceService = deviceService;
         this.securityCameraService = securityCameraService;
@@ -80,7 +80,7 @@ public class SecurityCameraController {
     }
 
     @PostMapping("/{id}/state")
-    public State sceneBinding(
+    public State sceneBinding(
             @PathVariable("id") long deviceId,
             @RequestParam long sceneId,
             final Principal principal)
@@ -90,7 +90,7 @@ public class SecurityCameraController {
                 securityCameraService
                         .findByIdAndUsername(deviceId, principal.getName())
                         .orElseThrow(NotFoundException::new);
-        State s = d.cloneState();
+        State s = d.cloneState();
         final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new);
         s.setSceneId(sc.getId());
         if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
index 88a78f6..43d659b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
@@ -19,7 +19,7 @@ public class SmartPlugController {
     @Autowired private DeviceService deviceService;
     @Autowired private SmartPlugRepository smartPlugRepository;
     @Autowired private SceneRepository sceneRepository;
-    @Autowired private StateRepository> stateRepository;
+    @Autowired private StateRepository stateRepository;
 
     private SmartPlug save(SmartPlug newSP, SwitchableSaveRequest sp, final Principal principal) {
         newSP.setOn(sp.isOn());
@@ -67,7 +67,7 @@ public class SmartPlugController {
     }
 
     @PostMapping("/{id}/state")
-    public State sceneBinding(
+    public State sceneBinding(
             @PathVariable("id") long deviceId,
             @RequestParam long sceneId,
             final Principal principal)
@@ -77,7 +77,7 @@ public class SmartPlugController {
                 smartPlugRepository
                         .findByIdAndUsername(deviceId, principal.getName())
                         .orElseThrow(NotFoundException::new);
-        State s = d.cloneState();
+        State s = d.cloneState();
         final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new);
         s.setSceneId(sc.getId());
         if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java
index ed6f30c..2fc9f18 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java
@@ -22,9 +22,9 @@ public class SwitchableStateController {
     @Autowired private SwitchableStateRepository switchableStateRepository;
 
     @PutMapping
-    public SwitchableState update(@Valid @RequestBody SwitchableStateSaveRequest ss)
+    public SwitchableState update(@Valid @RequestBody SwitchableStateSaveRequest ss)
             throws NotFoundException {
-        final SwitchableState initial =
+        final SwitchableState initial =
                 switchableStateRepository.findById(ss.getId()).orElseThrow(NotFoundException::new);
         initial.setOn(ss.isOn());
         switchableStateRepository.save(initial);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
index 0696822..72b4934 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
@@ -21,7 +21,7 @@ public class ThermostatController {
     @Autowired private ThermostatRepository thermostatRepository;
     @Autowired private ThermostatPopulationService thermostatService;
     @Autowired private SceneRepository sceneRepository;
-    @Autowired private StateRepository> stateRepository;
+    @Autowired private StateRepository stateRepository;
 
     private Thermostat save(Thermostat newT, ThermostatSaveRequest t, final Principal principal) {
         newT.setTargetTemperature(t.getTargetTemperature());
@@ -63,7 +63,7 @@ public class ThermostatController {
     }
 
     @PostMapping("/{id}/state")
-    public State sceneBinding(
+    public State sceneBinding(
             @PathVariable("id") long deviceId,
             @RequestParam long sceneId,
             final Principal principal)
@@ -73,7 +73,7 @@ public class ThermostatController {
                 thermostatRepository
                         .findByIdAndUsername(deviceId, principal.getName())
                         .orElseThrow(NotFoundException::new);
-        State s = d.cloneState();
+        State s = d.cloneState();
         final Scene sc = sceneRepository.findById(sceneId).orElseThrow(NotFoundException::new);
         s.setSceneId(sc.getId());
         if (stateRepository.countByDeviceIdAndSceneId(deviceId, sceneId) > 0)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
index bc16615..0f99d0d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
@@ -67,7 +67,7 @@ public abstract class Device {
     @OneToMany(mappedBy = "device", orphanRemoval = true)
     @GsonExclude
     @SocketGsonExclude
-    private Set> states;
+    private Set states;
 
     @Transient @GsonExclude private Long fromHostId = null;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
index 37f40e1..74b4479 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
@@ -65,15 +65,13 @@ public class Dimmable extends Switchable implements RangeTriggerable {
         intensity = on ? oldIntensity : 0;
     }
 
-    public void readStateAndSet(DimmableState state) {
+    public void readStateAndSet(DimmableState state) {
         setIntensity(state.getIntensity());
     }
 
-    @Override
-    public State cloneState() {
-        final DimmableState newState = new DimmableState<>();
+    public State cloneState() {
+        final DimmableState newState = new DimmableState();
         newState.setDeviceId(getId());
-        newState.setDevice(this);
         newState.setIntensity(getIntensity());
         return newState;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java
index e004c1f..c9cceec 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableState.java
@@ -8,7 +8,11 @@ import lombok.Setter;
 
 /** Represent a state for an IDimmable device */
 @Entity
-public class DimmableState extends State {
+public class DimmableState extends State {
+
+    public void setDevice(Dimmable device) {
+        setInnerDevice(device);
+    }
 
     /** The light intensity value. Goes from 0 (off) to 100 (on) */
     @Min(0)
@@ -19,12 +23,12 @@ public class DimmableState extends State {
 
     @Override
     public void apply() {
-        getDevice().readStateAndSet(this);
+        ((Dimmable) getDevice()).readStateAndSet(this);
     }
 
     @Override
-    protected State copy() {
-        final DimmableState d = new DimmableState<>();
+    protected DimmableState copy() {
+        final DimmableState d = new DimmableState();
         d.setIntensity(intensity);
         return d;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateRepository.java
index 00edb96..8cced24 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateRepository.java
@@ -1,3 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-public interface DimmableStateRepository extends StateRepository> {}
+public interface DimmableStateRepository extends StateRepository {}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java
index ba1813e..4147fba 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java
@@ -14,10 +14,10 @@ public abstract class OutputDevice extends Device {
     }
 
     /**
-     * Creates a State object initialized to point at this device and with values copied from
-     * this device's state
+     * Creates a State object initialized to point at this device and with values copied from this
+     * device's state
      *
-     * @return a new State object
+     * @return a new State object
      */
-    public abstract State cloneState();
+    public abstract State cloneState();
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java
index 63cccb4..b9d80de 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java
@@ -5,11 +5,13 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.Data;
 
 /**
  * Represent a collection of state changes to devices even in different rooms but belonging to the
  * same user
  */
+@Data
 @Entity
 public class Scene {
 
@@ -30,7 +32,7 @@ public class Scene {
 
     @OneToMany(mappedBy = "scene", orphanRemoval = true)
     @GsonExclude
-    private Set> states = new HashSet<>();
+    private Set states = new HashSet<>();
 
     /** The user given name of this room (e.g. 'Master bedroom') */
     @Column(nullable = false)
@@ -41,60 +43,4 @@ public class Scene {
 
     /** Determines whether a guest can access this scene */
     @Column private boolean guestAccessEnabled;
-
-    public Icon getIcon() {
-        return icon;
-    }
-
-    public void setIcon(Icon icon) {
-        this.icon = icon;
-    }
-
-    public boolean isGuestAccessEnabled() {
-        return guestAccessEnabled;
-    }
-
-    public void setGuestAccessEnabled(boolean guestAccessEnabled) {
-        this.guestAccessEnabled = guestAccessEnabled;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Set> getStates() {
-        return states;
-    }
-
-    public void setStates(Set> states) {
-        this.states = states;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java
index 8637500..ae737ab 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java
@@ -3,6 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import io.swagger.annotations.ApiModelProperty;
 import javax.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Represents instructions on how to change the state of a particular device. Many states (plus
@@ -11,93 +13,66 @@ import javax.persistence.*;
 @Entity
 @Table(uniqueConstraints = {@UniqueConstraint(columnNames = {"device_id", "scene_id"})})
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-public abstract class State {
+public abstract class State {
+
+    @ManyToOne(targetEntity = OutputDevice.class)
+    @JoinColumn(name = "device_id", updatable = false, insertable = false)
+    @GsonExclude
+    @Getter
+    private OutputDevice device;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id", updatable = false, nullable = false, unique = true)
     @ApiModelProperty(hidden = true)
+    @Getter
     private long id;
 
-    @ManyToOne(targetEntity = OutputDevice.class)
-    @JoinColumn(name = "device_id", updatable = false, insertable = false)
-    @GsonExclude
-    private D device;
-
     /**
      * The device this state belongs in, as a foreign key id. To use when updating and inserting
      * from a REST call.
      */
     @Column(name = "device_id", nullable = false)
+    @Getter
+    @Setter
     private Long deviceId;
 
     @ManyToOne
     @JoinColumn(name = "scene_id", updatable = false, insertable = false)
     @GsonExclude
+    @Getter
+    @Setter
     private Scene scene;
 
     @Column(name = "scene_id", nullable = false)
+    @Getter
+    @Setter
     private Long sceneId;
 
+    protected void setInnerDevice(OutputDevice device) {
+        this.device = device;
+    }
+
     /** Sets the state of the connected device to the state represented by this object. */
     public abstract void apply();
 
     /** Creates a perfect copy of this state, except for the id field and the sceneId/scene */
-    protected abstract State copy();
+    protected abstract State copy();
 
-    public State copyToSceneId(Long sceneId) {
-        final State s = copy();
+    public State copyToSceneId(Long sceneId) {
+        final State s = copy();
         s.setDeviceId(this.deviceId);
+        s.device = this.device;
         s.setSceneId(sceneId);
+        s.setScene(this.scene);
         return s;
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public D getDevice() {
-        return device;
-    }
-
-    public void setDevice(D device) {
-        this.device = device;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Scene getScene() {
-        return scene;
-    }
-
-    public void setScene(Scene scene) {
-        this.scene = scene;
-    }
-
-    public Long getSceneId() {
-        return sceneId;
-    }
-
-    public void setSceneId(Long sceneId) {
-        this.sceneId = sceneId;
-    }
-
     @PreRemove
     public void removeDeviceAndScene() {
-        this.setScene(null);
         this.setSceneId(null);
-
-        this.setDevice(null);
+        this.setScene(null);
         this.setDeviceId(null);
+        this.device = null;
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateRepository.java
index d2d1278..b3195b7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateRepository.java
@@ -5,7 +5,7 @@ import javax.transaction.Transactional;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 
-public interface StateRepository> extends CrudRepository {
+public interface StateRepository extends CrudRepository {
 
     @Transactional
     void deleteAllBySceneId(long roomId);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index a1a5366..f2d2c44 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -45,15 +45,13 @@ public abstract class Switchable extends OutputDevice {
         return inputs;
     }
 
-    public void readStateAndSet(SwitchableState state) {
+    public void readStateAndSet(SwitchableState state) {
         setOn(state.isOn());
     }
 
-    @Override
-    public State cloneState() {
-        final SwitchableState newState = new SwitchableState<>();
+    public State cloneState() {
+        final SwitchableState newState = new SwitchableState();
         newState.setDeviceId(getId());
-        newState.setDevice(this);
         newState.setOn(isOn());
         return newState;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java
index be21b6e..38307af 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableState.java
@@ -2,30 +2,30 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
 
 /** Represents a state for a Switchable device */
 @Entity
-public class SwitchableState extends State {
+public class SwitchableState extends State {
+
+    public void setDevice(Switchable device) {
+        setInnerDevice(device);
+    }
 
     @Column(name = "switchable_on")
+    @Getter
+    @Setter
     private boolean on;
 
-    public boolean isOn() {
-        return on;
-    }
-
-    public void setOn(boolean on) {
-        this.on = on;
-    }
-
     @Override
     public void apply() {
-        getDevice().readStateAndSet(this);
+        ((Switchable) getDevice()).readStateAndSet(this);
     }
 
     @Override
-    protected State copy() {
-        final SwitchableState d = new SwitchableState<>();
+    protected SwitchableState copy() {
+        final SwitchableState d = new SwitchableState();
         d.setOn(on);
         return d;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateRepository.java
index 933ac6c..5c9850b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateRepository.java
@@ -1,3 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-public interface SwitchableStateRepository extends StateRepository> {}
+public interface SwitchableStateRepository extends StateRepository {}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java
index 824ea7e..711a94d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneService.java
@@ -11,7 +11,7 @@ public class SceneService {
 
     private final DevicePopulationService devicePopulationService;
     private final DevicePropagationService devicePropagationService;
-    private final StateRepository> stateRepository;
+    private final StateRepository stateRepository;
     private final SceneRepository sceneRepository;
 
     public Scene findByValidatedId(Long id) {
@@ -22,7 +22,7 @@ public class SceneService {
     public SceneService(
             DevicePopulationService devicePopulationService,
             DevicePropagationService devicePropagationService,
-            StateRepository> stateRepository,
+            StateRepository stateRepository,
             SceneRepository sceneRepository) {
         this.devicePopulationService = devicePopulationService;
         this.devicePropagationService = devicePropagationService;
@@ -33,7 +33,7 @@ public class SceneService {
     private List copyStatesToDevices(Scene fromScene) {
         final List updated = new ArrayList<>(fromScene.getStates().size());
 
-        for (final State s : fromScene.getStates()) {
+        for (final State s : fromScene.getStates()) {
             s.apply();
             updated.add(s.getDevice());
         }
@@ -54,9 +54,9 @@ public class SceneService {
         return updated;
     }
 
-    public List> copyStates(Scene to, Scene from) {
-        final ArrayList> states = new ArrayList<>();
-        for (final State s : from.getStates()) {
+    public List copyStates(Scene to, Scene from) {
+        final ArrayList states = new ArrayList<>();
+        for (final State s : from.getStates()) {
             states.add(stateRepository.save(s.copyToSceneId(to.getId())));
         }
         return states;

From b4bf15583a6a1955be8c6edd282bb20823409700 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Wed, 13 May 2020 09:42:36 +0200
Subject: [PATCH 053/176] a couple of tests

---
 .../sa4/sanmarinoes/smarthut/RoomTests.java   |  5 +-
 .../smarthut/SceneSaveRequestTests.java       | 53 ++++++++++++
 .../smarthut/SensorSaveRequestTests.java      | 71 ++++++++++++++++
 .../smarthut/SwitchOperationRequestTests.java | 46 +++++++++++
 .../smarthut/SwitchableSaveRequestTests.java  | 62 ++++++++++++++
 .../SwitchableStateSaveRequestTests.java      | 46 +++++++++++
 .../ThermostatConditionSaveRequestTests.java  | 62 ++++++++++++++
 .../smarthut/ThermostatSaveRequestTests.java  | 82 +++++++++++++++++++
 .../UserRegistrationRequestTests.java         | 46 +++++++++++
 .../smarthut/UserResponseTests.java           | 42 ++++++++++
 .../smarthut/UserUpdateRequestTests.java      |  3 +
 11 files changed, 516 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserUpdateRequestTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
index 44aac75..781473b 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
@@ -3,6 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import javax.swing.*;
@@ -75,7 +76,7 @@ public class RoomTests {
     @DisplayName("test Icon")
     public void testIcon() {
         // ImageIcon image = new ImageIcon("file","description");
-        room.setIcon(null);
-        assertEquals(null, room.getIcon());
+        room.setIcon(Icon.FEMALE);
+        assertEquals("female", room.getIcon().toString());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java
new file mode 100644
index 0000000..5caadf9
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java
@@ -0,0 +1,53 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SceneSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("SceneSaveRequest tests")
+public class SceneSaveRequestTests {
+
+    private SceneSaveRequest scene;
+
+    @BeforeEach
+    private void createSceneSaveRequest() {
+        scene = new SceneSaveRequest();
+    }
+
+    @Test
+    @DisplayName("guestAccessEnable")
+    public void testGuestAccess() {
+        assertFalse(scene.isGuestAccessEnabled());
+    }
+
+    @Test
+    @DisplayName("set guestAccess")
+    public void testSetGuestAccess() {
+        scene.setGuestAccessEnabled(true);
+        assertTrue(scene.isGuestAccessEnabled());
+    }
+
+    @Test
+    @DisplayName("test getId")
+    public void testGetId() {
+        assertEquals(0l, scene.getId());
+    }
+
+    @Test
+    @DisplayName("test getName")
+    public void testGetName() {
+        scene.setName("Roberto");
+        assertEquals("Roberto", scene.getName());
+    }
+
+    @Test
+    @DisplayName("test getIcon")
+    public void testGetIcon() {
+        scene.setIcon(Icon.FEMALE);
+        assertEquals("female", scene.getIcon().toString());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
new file mode 100644
index 0000000..e3529bd
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
@@ -0,0 +1,71 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("SensorSaveRequest tests")
+public class SensorSaveRequestTests {
+
+    private SensorSaveRequest sensor;
+
+    @BeforeEach
+    public void createSensorSaveRequest() {
+        this.sensor = new SensorSaveRequest();
+    }
+
+    @Test
+    @DisplayName("test setRoomId")
+    public void testSetRoomId() {
+        sensor.setRoomId(42l);
+        assertEquals(42l, sensor.getRoomId());
+    }
+
+    @Test
+    @DisplayName("test setName")
+    public void testSetName() {
+        sensor.setName("Giovanni");
+        assertEquals("Giovanni", sensor.getName());
+    }
+
+    @Test
+    @DisplayName("test setValue")
+    public void testSetValue() {
+        sensor.setValue(new BigDecimal(42));
+        assertEquals(new BigDecimal(42), sensor.getValue());
+    }
+
+    @Test
+    @DisplayName("test set to TEMPERATURE")
+    public void testSetToTemperature() {
+        sensor.setSensor(Sensor.SensorType.TEMPERATURE);
+        assertEquals(Sensor.SensorType.TEMPERATURE, sensor.getSensor());
+    }
+
+    @Test
+    @DisplayName("test set to HUMIDITY")
+    public void testSetToHumidity() {
+        sensor.setSensor(Sensor.SensorType.HUMIDITY);
+        assertEquals(Sensor.SensorType.HUMIDITY, sensor.getSensor());
+    }
+
+    @Test
+    @DisplayName("test set to LIGHT")
+    public void testSetToLight() {
+        sensor.setSensor(Sensor.SensorType.LIGHT);
+        assertEquals(Sensor.SensorType.LIGHT, sensor.getSensor());
+    }
+
+    @Test
+    @DisplayName("test SensorType")
+    public void testSetSensorType() {
+        assertEquals("TEMPERATURE", Sensor.SensorType.TEMPERATURE.name());
+        assertEquals("HUMIDITY", Sensor.SensorType.HUMIDITY.name());
+        assertEquals("LIGHT", Sensor.SensorType.LIGHT.name());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java
new file mode 100644
index 0000000..1a6634a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java
@@ -0,0 +1,46 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchOperationRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("switchOperationRequest tests")
+public class SwitchOperationRequestTests {
+    private SwitchOperationRequest request;
+
+    @BeforeEach
+    private void createRequest() {
+        this.request = new SwitchOperationRequest();
+    }
+
+    @Test
+    @DisplayName("test setId")
+    public void testSetId() {
+        request.setId(42l);
+        assertEquals(42l, request.getId());
+    }
+
+    @Test
+    @DisplayName("test setType")
+    public void testSetTypeOFF() {
+        request.setType(SwitchOperationRequest.OperationType.OFF);
+        assertEquals(SwitchOperationRequest.OperationType.OFF, request.getType());
+    }
+
+    @Test
+    @DisplayName("test setType")
+    public void testSetTypeON() {
+        request.setType(SwitchOperationRequest.OperationType.ON);
+        assertEquals(SwitchOperationRequest.OperationType.ON, request.getType());
+    }
+
+    @Test
+    @DisplayName("test setType")
+    public void testSetTypeTOGGLE() {
+        request.setType(SwitchOperationRequest.OperationType.TOGGLE);
+        assertEquals(SwitchOperationRequest.OperationType.TOGGLE, request.getType());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
new file mode 100644
index 0000000..1e10a54
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
@@ -0,0 +1,62 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("SwitchableSaveRequest tests")
+public class SwitchableSaveRequestTests {
+
+    private SwitchableSaveRequest saveRequest;
+
+    @BeforeEach
+    private void createSaveRequest() {
+        this.saveRequest = new SwitchableSaveRequest();
+    }
+
+    @Test
+    @DisplayName("test setRoomId")
+    public void testSetRoomId() {
+        saveRequest.setRoomId(42l);
+        assertEquals(42l, saveRequest.getRoomId());
+    }
+
+    @Test
+    @DisplayName("test setName")
+    public void testSetName() {
+        saveRequest.setName("Giovanni");
+        assertEquals("Giovanni", saveRequest.getName());
+    }
+
+    @Test
+    @DisplayName("test isOn()")
+    public void inOnTest() {
+        assertFalse(saveRequest.isOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(true) ")
+    public void setOnTestTrue() {
+        saveRequest.setOn(true);
+        assertTrue(saveRequest.isOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(false) ")
+    public void setOnTestFalse() {
+        saveRequest.setOn(false);
+        assertFalse(saveRequest.isOn());
+    }
+
+    @Test
+    @DisplayName("test setId")
+    public void testSetId() {
+        saveRequest.setId(300771l);
+        assertEquals(300771l, saveRequest.getId());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
new file mode 100644
index 0000000..407d2c3
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
@@ -0,0 +1,46 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableStateSaveRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("switchableStateSaveRequest tests")
+public class SwitchableStateSaveRequestTests {
+    private SwitchableStateSaveRequest saveRequest;
+
+    @BeforeEach
+    public void createSwitchableStateSaveRequest() {
+        this.saveRequest = new SwitchableStateSaveRequest();
+    }
+
+    @Test
+    @DisplayName("test isOn()")
+    public void inOnTest() {
+        assertFalse(saveRequest.isOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(true) ")
+    public void setOnTestTrue() {
+        saveRequest.setOn(true);
+        assertTrue(saveRequest.isOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(false) ")
+    public void setOnTestFalse() {
+        saveRequest.setOn(false);
+        assertFalse(saveRequest.isOn());
+    }
+
+    @Test
+    @DisplayName("test setId")
+    public void testSetId() {
+        assertEquals(null, saveRequest.getId());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java
new file mode 100644
index 0000000..eeb108b
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java
@@ -0,0 +1,62 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatConditionSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("ThermostatConditionSaveRequest tests")
+public class ThermostatConditionSaveRequestTests {
+
+    private ThermostatConditionSaveRequest saveRequest;
+
+    @BeforeEach
+    private void createSaveRequest() {
+        this.saveRequest = new ThermostatConditionSaveRequest();
+    }
+
+    @Test
+    @DisplayName("test setDeviceId")
+    public void testSetDeviceId() {
+        this.saveRequest.setDeviceId(42l);
+        assertEquals(42l, saveRequest.getDeviceId());
+    }
+
+    @Test
+    @DisplayName("test setAutomationId")
+    public void testSetAutomationId() {
+        this.saveRequest.setAutomationId(42l);
+        assertEquals(42l, saveRequest.getAutomationId());
+    }
+
+    @Test
+    @DisplayName("test setOperator")
+    public void testSetOperatorEqual() {
+        saveRequest.setOperator(ThermostatCondition.Operator.EQUAL);
+        assertEquals(ThermostatCondition.Operator.EQUAL, saveRequest.getOperator());
+    }
+
+    @Test
+    @DisplayName("test setOperator")
+    public void testSetOperatorNotEqual() {
+        saveRequest.setOperator(ThermostatCondition.Operator.NOTEQUAL);
+        assertEquals(ThermostatCondition.Operator.NOTEQUAL, saveRequest.getOperator());
+    }
+
+    @Test
+    @DisplayName("test setMode")
+    public void testSetMode() {
+        saveRequest.setMode(Thermostat.Mode.HEATING);
+        assertEquals(Thermostat.Mode.HEATING, saveRequest.getMode());
+    }
+
+    @Test
+    @DisplayName("test getId")
+    public void testGetId() {
+        assertEquals(0l, saveRequest.getId());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
new file mode 100644
index 0000000..dac79f2
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
@@ -0,0 +1,82 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatSaveRequest;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("ThermostatSaveRequest tests")
+public class ThermostatSaveRequestTests {
+    private ThermostatSaveRequest saveRequest;
+
+    @BeforeEach
+    private void createSaveRequest() {
+        saveRequest = new ThermostatSaveRequest();
+    }
+
+    @Test
+    @DisplayName("test setRoomId")
+    public void testSetRoomId() {
+        saveRequest.setRoomId(42l);
+        assertEquals(42l, saveRequest.getRoomId());
+    }
+
+    @Test
+    @DisplayName("test setName")
+    public void testSetName() {
+        saveRequest.setName("Giovanni");
+        assertEquals("Giovanni", saveRequest.getName());
+    }
+
+    @Test
+    @DisplayName("test isOn()")
+    public void inOnTest() {
+        assertFalse(saveRequest.isTurnOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(true) ")
+    public void setOnTestTrue() {
+        saveRequest.setTurnOn(true);
+        assertTrue(saveRequest.isTurnOn());
+    }
+
+    @Test
+    @DisplayName("test setOn(false) ")
+    public void setOnTestFalse() {
+        saveRequest.setTurnOn(false);
+        assertFalse(saveRequest.isTurnOn());
+    }
+
+    @Test
+    @DisplayName("test setId")
+    public void testSetId() {
+        saveRequest.setId(17l);
+        assertEquals(17l, saveRequest.getId());
+    }
+
+    @Test
+    @DisplayName("test setExternalSensor true")
+    public void testExternalSensorTrue() {
+        saveRequest.setUseExternalSensors(true);
+        assertTrue(saveRequest.isUseExternalSensors());
+    }
+
+    @Test
+    @DisplayName("test setExternalSensor false")
+    public void testExternalSensorFalse() {
+        saveRequest.setUseExternalSensors(false);
+        assertFalse(saveRequest.isUseExternalSensors());
+    }
+
+    @Test
+    @DisplayName("test targetTemperature")
+    public void testTargetTemperature() {
+        saveRequest.setTargetTemperature(new BigDecimal(23));
+        assertEquals(new BigDecimal(23), saveRequest.getTargetTemperature());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java
new file mode 100644
index 0000000..8126088
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java
@@ -0,0 +1,46 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("userRegistrationRequest tests")
+public class UserRegistrationRequestTests {
+    private UserRegistrationRequest request;
+
+    @BeforeEach
+    private void createRequest() {
+        request = new UserRegistrationRequest();
+    }
+
+    @Test
+    @DisplayName("test setName")
+    public void testSetName() {
+        request.setName("Tizio Sempronio");
+        assertEquals("Tizio Sempronio", request.getName());
+    }
+
+    @Test
+    @DisplayName("test setUserName")
+    public void testUserName() {
+        request.setUsername("xXDarkAngelCraftXx");
+        assertEquals("xXDarkAngelCraftXx", request.getUsername());
+    }
+
+    @Test
+    @DisplayName("test setPassword")
+    public void testPassword() {
+        request.setPassword("password123");
+        assertEquals("password123", request.getPassword());
+    }
+
+    @Test
+    @DisplayName("test setEmail")
+    public void testEmail() {
+        request.setEmail("fakemail@service.ussr");
+        assertEquals("fakemail@service.ussr", request.getEmail());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
new file mode 100644
index 0000000..621f64c
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
@@ -0,0 +1,42 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("test UserResponse")
+public class UserResponseTests {
+    private UserResponse response;
+    private User user;
+
+    @BeforeEach
+    private void createUser() {
+        user = new User();
+        user.setName("John RealName");
+        user.setId(29l);
+        user.setUsername("pseudonym");
+        response = response.fromUser(user);
+    }
+
+    @Test
+    @DisplayName("test getId")
+    public void testGetId() {
+        assertEquals(29l, response.getId());
+    }
+
+    @Test
+    @DisplayName("test getUsername")
+    public void testGetUsername() {
+        assertEquals("pseudonym", response.getUsername());
+    }
+
+    @Test
+    @DisplayName("test getName")
+    public void testGetaName() {
+        assertEquals("John RealName", response.getName());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserUpdateRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserUpdateRequestTests.java
new file mode 100644
index 0000000..e0232ed
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserUpdateRequestTests.java
@@ -0,0 +1,3 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+public class UserUpdateRequestTests {}

From 3ed6102b9fd60c2ad588eefdd9b838fbd339a179 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 13 May 2020 11:57:31 +0200
Subject: [PATCH 054/176] Added example tests for SensorController

---
 .../smarthut/dto/SensorSaveRequest.java       |  2 +
 .../controller/SensorControllerTests.java     | 77 +++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
index 8566bde..bd86cd3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
@@ -5,9 +5,11 @@ import java.math.BigDecimal;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
+@AllArgsConstructor
 public class SensorSaveRequest {
     /** The type of this sensor */
     @NotNull
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
new file mode 100644
index 0000000..6ef3158
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -0,0 +1,77 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.math.BigDecimal;
+import java.security.Principal;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("The sensor controller")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class SensorControllerTests {
+    @InjectMocks private SensorController sensorController;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private Principal mockPrincipal;
+
+    @BeforeEach
+    public void setup() {
+        when(mockPrincipal.getName()).thenReturn("user");
+    }
+
+    private void checkSensorAgainstRequest(final Sensor toCheck, final SensorSaveRequest request) {
+        assertThat(toCheck).isNotNull();
+        assertThat(toCheck.getSensor()).isEqualTo(request.getSensor());
+        assertThat(toCheck.getValue()).isEqualTo(request.getValue());
+        assertThat(toCheck.getName()).isEqualTo(request.getName());
+        assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
+    }
+
+    @DisplayName("when creating should return the same object")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(deviceService.saveAsOwner(any(Sensor.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final SensorSaveRequest toSend =
+                new SensorSaveRequest(
+                        Sensor.SensorType.TEMPERATURE, BigDecimal.ZERO, 42L, "Test sensor");
+        final Sensor created = sensorController.create(toSend, mockPrincipal);
+
+        checkSensorAgainstRequest(created, toSend);
+    }
+
+    @DisplayName("when deleting an existant id should succeed")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        sensorController.deleteById(42L, mockPrincipal);
+    }
+}

From 368530de97160059bf9aedcda9cf5a7e64b1e9b2 Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Thu, 14 May 2020 19:00:07 +0200
Subject: [PATCH 055/176] automation dto should be tested

---
 .../dto/AutomationFastUpdateRequest.java      | 12 +--
 .../AutomationFastUpdateRequestTest.java      | 97 +++++++++++++++++++
 2 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index 4217761..ada8906 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -28,8 +28,8 @@ public class AutomationFastUpdateRequest {
     }
 
     public static class RangeTriggerDTO extends TriggerDTO {
-        @NotNull Operator operator;
-        @NotNull double range;
+        @NotNull public Operator operator;
+        @NotNull public double range;
 
         @Override
         public Trigger toModel() {
@@ -77,8 +77,8 @@ public class AutomationFastUpdateRequest {
 
     public static class RangeConditionDTO extends ConditionDTO {
 
-        @NotNull Operator operator;
-        @NotNull double range;
+        @NotNull public Operator operator;
+        @NotNull public double range;
 
         @Override
         public Condition toModel() {
@@ -92,8 +92,8 @@ public class AutomationFastUpdateRequest {
 
     public static class ThermostatConditionDTO extends ConditionDTO {
 
-        @NotNull ThermostatCondition.Operator operator;
-        @NotNull private Thermostat.Mode mode;
+        @NotNull public ThermostatCondition.Operator operator;
+        @NotNull public Thermostat.Mode mode;
 
         @Override
         public Condition toModel() {
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
new file mode 100644
index 0000000..70e1f99
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
@@ -0,0 +1,97 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Automation Update DTO")
+public class AutomationFastUpdateRequestTest {
+
+    AutomationFastUpdateRequest.BooleanTriggerDTO booleanTriggerDTO;
+    AutomationFastUpdateRequest.RangeTriggerDTO rangeTriggerDTO;
+    AutomationFastUpdateRequest.ScenePriorityDTO scenePriorityDTO;
+    AutomationFastUpdateRequest.BooleanConditionDTO booleanConditionDTO;
+    AutomationFastUpdateRequest.RangeConditionDTO rangeConditionDTO;
+    AutomationFastUpdateRequest.ThermostatConditionDTO thermostatConditionDTO;
+
+    @Test
+    @DisplayName(" checking boolean trigger ")
+    public void booleanTriggerDTOTest() {
+        booleanTriggerDTO = new AutomationFastUpdateRequest.BooleanTriggerDTO();
+        booleanTriggerDTO.on = true;
+        booleanTriggerDTO.deviceId = 42;
+        BooleanTrigger booleanTrigger = (BooleanTrigger) booleanTriggerDTO.toModel();
+        assertEquals(booleanTrigger.isOn(), booleanTriggerDTO.on);
+        assertEquals(booleanTrigger.getDeviceId(), booleanTriggerDTO.deviceId);
+    }
+
+    @Test
+    @DisplayName(" checking range trigger ")
+    public void rangeTriggerDTOTest() {
+        rangeTriggerDTO = new AutomationFastUpdateRequest.RangeTriggerDTO();
+        rangeTriggerDTO.operator = Operator.EQUAL;
+        rangeTriggerDTO.deviceId = 420;
+        rangeTriggerDTO.range = 12;
+
+        RangeTrigger rangeTrigger = (RangeTrigger) rangeTriggerDTO.toModel();
+        assertEquals(rangeTrigger.getOperator(), rangeTriggerDTO.operator);
+        assertEquals(rangeTrigger.getRange(), rangeTriggerDTO.range);
+        assertEquals(rangeTrigger.getDeviceId(), rangeTriggerDTO.deviceId);
+    }
+
+    @Test
+    @DisplayName(" checking scene priority ")
+    public void scenePriorityDTOTest() {
+        scenePriorityDTO = new AutomationFastUpdateRequest.ScenePriorityDTO();
+        scenePriorityDTO.priority = 67;
+        scenePriorityDTO.sceneId = 21;
+
+        ScenePriority scenePriority = scenePriorityDTO.toModel();
+        assertEquals(scenePriority.getPriority(), scenePriorityDTO.priority);
+        assertEquals(scenePriority.getSceneId(), scenePriorityDTO.priority);
+    }
+
+    @Test
+    @DisplayName(" checking boolean condition ")
+    public void booleanConditionDTOTest() {
+        booleanConditionDTO = new AutomationFastUpdateRequest.BooleanConditionDTO();
+        booleanConditionDTO.on = true;
+        booleanConditionDTO.deviceId = 17;
+
+        BooleanCondition booleanCondition = (BooleanCondition) booleanConditionDTO.toModel();
+        assertEquals(booleanCondition.isOn(), booleanConditionDTO.on);
+        assertEquals(booleanCondition.getDeviceId(), booleanConditionDTO.deviceId);
+    }
+
+    @Test
+    @DisplayName(" checking range condition ")
+    public void rangeConditionDTOTest() {
+        rangeConditionDTO = new AutomationFastUpdateRequest.RangeConditionDTO();
+        rangeConditionDTO.operator = Operator.LESS;
+        rangeConditionDTO.range = 82.01;
+        rangeConditionDTO.deviceId = 13;
+
+        RangeCondition rangeCondition = (RangeCondition) rangeConditionDTO.toModel();
+        assertEquals(rangeCondition.getOperator(), rangeConditionDTO.operator);
+        assertEquals(rangeCondition.getRange(), rangeConditionDTO.range);
+        assertEquals(rangeCondition.getDeviceId(), rangeConditionDTO.deviceId);
+    }
+
+    @Test
+    @DisplayName(" checking thermostat condition ")
+    public void thermostatConditionDTOTest() {
+        thermostatConditionDTO = new AutomationFastUpdateRequest.ThermostatConditionDTO();
+        thermostatConditionDTO.deviceId = 25;
+        thermostatConditionDTO.operator = ThermostatCondition.Operator.EQUAL;
+        thermostatConditionDTO.mode = Thermostat.Mode.HEATING;
+
+        ThermostatCondition thermostatCondition =
+                (ThermostatCondition) thermostatConditionDTO.toModel();
+        assertEquals(thermostatCondition.getMode(), thermostatConditionDTO.mode);
+        assertEquals(thermostatCondition.getOperator(), thermostatConditionDTO.operator);
+        assertEquals(thermostatCondition.getDeviceId(), thermostatConditionDTO.deviceId);
+    }
+}

From 3dcfa584f070e6ab11a182fb073983611f306fa6 Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Thu, 14 May 2020 21:02:49 +0200
Subject: [PATCH 056/176] made some fields private

---
 .../dto/AutomationFastUpdateRequest.java      | 14 ++++++-----
 .../AutomationFastUpdateRequestTest.java      | 24 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index ada8906..f086fef 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -8,6 +8,8 @@ import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
+@Getter
+@Setter
 public class AutomationFastUpdateRequest {
     public abstract static class TriggerDTO {
         @NotNull public long deviceId;
@@ -28,8 +30,8 @@ public class AutomationFastUpdateRequest {
     }
 
     public static class RangeTriggerDTO extends TriggerDTO {
-        @NotNull public Operator operator;
-        @NotNull public double range;
+        @NotNull private Operator operator;
+        @NotNull private double range;
 
         @Override
         public Trigger toModel() {
@@ -77,8 +79,8 @@ public class AutomationFastUpdateRequest {
 
     public static class RangeConditionDTO extends ConditionDTO {
 
-        @NotNull public Operator operator;
-        @NotNull public double range;
+        @NotNull private Operator operator;
+        @NotNull private double range;
 
         @Override
         public Condition toModel() {
@@ -92,8 +94,8 @@ public class AutomationFastUpdateRequest {
 
     public static class ThermostatConditionDTO extends ConditionDTO {
 
-        @NotNull public ThermostatCondition.Operator operator;
-        @NotNull public Thermostat.Mode mode;
+        @NotNull private ThermostatCondition.Operator operator;
+        @NotNull private Thermostat.Mode mode;
 
         @Override
         public Condition toModel() {
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
index 70e1f99..013f067 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
@@ -32,13 +32,13 @@ public class AutomationFastUpdateRequestTest {
     @DisplayName(" checking range trigger ")
     public void rangeTriggerDTOTest() {
         rangeTriggerDTO = new AutomationFastUpdateRequest.RangeTriggerDTO();
-        rangeTriggerDTO.operator = Operator.EQUAL;
+        rangeTriggerDTO.setOperator(Operator.EQUAL);
         rangeTriggerDTO.deviceId = 420;
-        rangeTriggerDTO.range = 12;
+        rangeTriggerDTO.setRange(12);
 
         RangeTrigger rangeTrigger = (RangeTrigger) rangeTriggerDTO.toModel();
-        assertEquals(rangeTrigger.getOperator(), rangeTriggerDTO.operator);
-        assertEquals(rangeTrigger.getRange(), rangeTriggerDTO.range);
+        assertEquals(rangeTrigger.getOperator(), rangeTriggerDTO.getOperator());
+        assertEquals(rangeTrigger.getRange(), rangeTriggerDTO.getRange());
         assertEquals(rangeTrigger.getDeviceId(), rangeTriggerDTO.deviceId);
     }
 
@@ -70,13 +70,13 @@ public class AutomationFastUpdateRequestTest {
     @DisplayName(" checking range condition ")
     public void rangeConditionDTOTest() {
         rangeConditionDTO = new AutomationFastUpdateRequest.RangeConditionDTO();
-        rangeConditionDTO.operator = Operator.LESS;
-        rangeConditionDTO.range = 82.01;
+        rangeConditionDTO.setOperator(Operator.LESS);
+        rangeConditionDTO.setRange(82.01);
         rangeConditionDTO.deviceId = 13;
 
         RangeCondition rangeCondition = (RangeCondition) rangeConditionDTO.toModel();
-        assertEquals(rangeCondition.getOperator(), rangeConditionDTO.operator);
-        assertEquals(rangeCondition.getRange(), rangeConditionDTO.range);
+        assertEquals(rangeCondition.getOperator(), rangeConditionDTO.getOperator());
+        assertEquals(rangeCondition.getRange(), rangeConditionDTO.getRange());
         assertEquals(rangeCondition.getDeviceId(), rangeConditionDTO.deviceId);
     }
 
@@ -85,13 +85,13 @@ public class AutomationFastUpdateRequestTest {
     public void thermostatConditionDTOTest() {
         thermostatConditionDTO = new AutomationFastUpdateRequest.ThermostatConditionDTO();
         thermostatConditionDTO.deviceId = 25;
-        thermostatConditionDTO.operator = ThermostatCondition.Operator.EQUAL;
-        thermostatConditionDTO.mode = Thermostat.Mode.HEATING;
+        thermostatConditionDTO.setOperator(ThermostatCondition.Operator.EQUAL);
+        thermostatConditionDTO.setMode(Thermostat.Mode.HEATING);
 
         ThermostatCondition thermostatCondition =
                 (ThermostatCondition) thermostatConditionDTO.toModel();
-        assertEquals(thermostatCondition.getMode(), thermostatConditionDTO.mode);
-        assertEquals(thermostatCondition.getOperator(), thermostatConditionDTO.operator);
+        assertEquals(thermostatCondition.getMode(), thermostatConditionDTO.getMode());
+        assertEquals(thermostatCondition.getOperator(), thermostatConditionDTO.getOperator());
         assertEquals(thermostatCondition.getDeviceId(), thermostatConditionDTO.deviceId);
     }
 }

From 3d9ddb5ffdee6be7b9a445817e0936ed0ac00266 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Fri, 15 May 2020 18:52:57 +0200
Subject: [PATCH 057/176] some tests

---
 .../smarthut/DimmableStateTests.java          | 38 ++++++++++++
 .../sa4/sanmarinoes/smarthut/DimmerTests.java | 44 +++++++++++++
 .../smarthut/MotionSensorTests.java           | 26 ++++++++
 .../smarthut/RangeConditionTests.java         | 61 ++++++++++++++++++
 .../smarthut/RangeTriggerTests.java           | 62 +++++++++++++++++++
 .../smarthut/ScenePriorityTests.java          | 43 +++++++++++++
 .../sa4/sanmarinoes/smarthut/SceneTests.java  | 52 ++++++++++++++++
 .../smarthut/SecurityCameraTests.java         | 44 +++++++++++++
 .../sa4/sanmarinoes/smarthut/SensorTests.java | 46 ++++++++++++++
 .../sa4/sanmarinoes/smarthut/StateTests.java  | 58 +++++++++++++++++
 10 files changed, 474 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
new file mode 100644
index 0000000..87bd181
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
@@ -0,0 +1,38 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Dimmable State Tests")
+public class DimmableStateTests {
+
+    private DimmableState dimmableState;
+
+    @BeforeEach
+    public void createDimmableState() {
+        dimmableState = new DimmableState<>();
+    }
+
+    @Test
+    @DisplayName("get and set intensity")
+    public void getAndSetIntensity() {
+        this.dimmableState.setIntensity(20);
+        assertEquals(20, this.dimmableState.getIntensity());
+    }
+
+    @Test
+    @DisplayName("apply")
+    public void apply() {
+        DimmableLight d = new DimmableLight();
+        d.setIntensity(45);
+        this.dimmableState.setDevice(d);
+        this.dimmableState.setIntensity(30);
+        this.dimmableState.apply();
+        assertEquals(30, this.dimmableState.getDevice().getIntensity());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
new file mode 100644
index 0000000..b3971b8
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
@@ -0,0 +1,44 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Dimmer Tests")
+public class DimmerTests {
+
+    private KnobDimmer dimmer;
+
+    @BeforeEach
+    public void createDimmer() {
+        dimmer = new KnobDimmer();
+    }
+
+    @Test
+    @DisplayName("connect true")
+    public void connectTrue() {
+        DimmableLight d = new DimmableLight();
+        dimmer.connect(d, true);
+
+        assertTrue(d.getDimmers().contains((this.dimmer)));
+
+        assertTrue((this.dimmer.getOutputs().contains(d)));
+    }
+
+    @Test
+    @DisplayName("connect off")
+    public void connectOff() {
+        DimmableLight d = new DimmableLight();
+        d.getDimmers().add(this.dimmer);
+        dimmer.getOutputs().add(d);
+        dimmer.connect(d, false);
+
+        assertFalse(d.getDimmers().contains((this.dimmer)));
+
+        assertFalse((this.dimmer.getOutputs().contains(d)));
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java
new file mode 100644
index 0000000..9a547e0
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java
@@ -0,0 +1,26 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Motion Sensor Tests")
+public class MotionSensorTests {
+
+    private MotionSensor motionSensor;
+
+    @BeforeEach
+    public void createMotionSensor() {
+        motionSensor = new MotionSensor();
+    }
+
+    @Test
+    @DisplayName("set and get detected")
+    public void setAndGetDetected() {
+        this.motionSensor.setDetected(true);
+        assertTrue(this.motionSensor.isDetected());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
new file mode 100644
index 0000000..354d6da
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
@@ -0,0 +1,61 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition.Operator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("RAnge Condition Tests")
+public class RangeConditionTests {
+
+    private RangeCondition rangeCondition;
+
+    @BeforeEach
+    public void creteRangeCondition() {
+        this.rangeCondition = new RangeCondition();
+    }
+
+    @Test
+    @DisplayName("set and get operator")
+    public void setAndGetOperator() {
+        rangeCondition.setOperator(RangeCondition.Operator.EQUAL);
+
+        assertEquals(RangeCondition.Operator.EQUAL, rangeCondition.getOperator());
+    }
+
+    @Test
+    @DisplayName("set and get range")
+    public void setAndGetRange() {
+        rangeCondition.setRange(20.5);
+
+        assertEquals(20.5, rangeCondition.getRange());
+    }
+
+    @Test
+    @DisplayName("triggered")
+    public void triggered() {
+        DimmableLight d = new DimmableLight();
+        d.setIntensity(40);
+        rangeCondition.setDevice(d);
+        rangeCondition.setRange(45D);
+
+        rangeCondition.setOperator(RangeCondition.Operator.EQUAL);
+        assertFalse(rangeCondition.triggered());
+
+        rangeCondition.setOperator(RangeCondition.Operator.LESS);
+        assertTrue(rangeCondition.triggered());
+
+        rangeCondition.setOperator(Operator.GREATER);
+        assertFalse(rangeCondition.triggered());
+
+        rangeCondition.setOperator(Operator.LESS_EQUAL);
+        assertTrue(rangeCondition.triggered());
+
+        rangeCondition.setOperator(Operator.GREATER_EQUAL);
+        assertFalse(rangeCondition.triggered());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
new file mode 100644
index 0000000..6dda510
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
@@ -0,0 +1,62 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Range Trigger Tests")
+public class RangeTriggerTests {
+
+    private RangeTrigger rangeTrigger;
+
+    @BeforeEach
+    public void createRangeTrigger() {
+        this.rangeTrigger = new RangeTrigger();
+    }
+
+    @Test
+    @DisplayName("set and get operator")
+    public void setAndGetOperator() {
+        rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL);
+
+        assertEquals(RangeTrigger.Operator.EQUAL, rangeTrigger.getOperator());
+    }
+
+    @Test
+    @DisplayName("set and get range")
+    public void setAndGetRange() {
+        rangeTrigger.setRange(20.5);
+
+        assertEquals(20.5, rangeTrigger.getRange());
+    }
+
+    @Test
+    @DisplayName("triggered")
+    public void triggered() {
+        DimmableLight d = new DimmableLight();
+        d.setIntensity(40);
+        rangeTrigger.setDevice(d);
+        rangeTrigger.setRange(45D);
+
+        rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL);
+        assertFalse(rangeTrigger.triggered());
+
+        rangeTrigger.setOperator(RangeTrigger.Operator.LESS);
+        assertTrue(rangeTrigger.triggered());
+
+        rangeTrigger.setOperator(RangeTrigger.Operator.GREATER);
+        assertFalse(rangeTrigger.triggered());
+
+        rangeTrigger.setOperator(RangeTrigger.Operator.LESS_EQUAL);
+        assertTrue(rangeTrigger.triggered());
+
+        rangeTrigger.setOperator(RangeTrigger.Operator.GREATER_EQUAL);
+        assertFalse(rangeTrigger.triggered());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java
new file mode 100644
index 0000000..6d27fbf
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java
@@ -0,0 +1,43 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Scene Priority Tests")
+public class ScenePriorityTests {
+
+    private ScenePriority scenePriority;
+
+    @BeforeEach
+    public void scenePriorityCreate() {
+        this.scenePriority = new ScenePriority();
+    }
+
+    @Test
+    @DisplayName("get and set automation id")
+    public void getAndSetAutomationId() {
+        scenePriority.setAutomationId(20L);
+
+        assertEquals(20, scenePriority.getAutomationId());
+    }
+
+    @Test
+    @DisplayName("get and set scene id")
+    public void getAndSetSceneId() {
+        scenePriority.setSceneId(20L);
+
+        assertEquals(20, scenePriority.getSceneId());
+    }
+
+    @Test
+    @DisplayName("get and set priority")
+    public void getAndSetPriority() {
+        scenePriority.setPriority(20);
+
+        assertEquals(20, scenePriority.getPriority());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java
new file mode 100644
index 0000000..28c6f84
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java
@@ -0,0 +1,52 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Scene Tests")
+public class SceneTests {
+
+    private Scene scene;
+
+    @BeforeEach
+    public void createScene() {
+        this.scene = new Scene();
+    }
+
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetId() {
+        scene.setId(20L);
+
+        assertEquals(20, scene.getId());
+    }
+
+    @Test
+    @DisplayName("get and set user id")
+    public void getAndSetUserId() {
+        scene.setUserId(20L);
+
+        assertEquals(20, scene.getUserId());
+    }
+
+    @Test
+    @DisplayName("get and set name")
+    public void getAndSetName() {
+        scene.setName("ciao mamma");
+
+        assertEquals("ciao mamma", scene.getName());
+    }
+
+    @Test
+    @DisplayName("get access enabled")
+    public void accessEnabled() {
+        scene.setGuestAccessEnabled(true);
+
+        assertTrue(scene.isGuestAccessEnabled());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
new file mode 100644
index 0000000..a9ed512
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
@@ -0,0 +1,44 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SecurityCamera;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Security Camera Tests")
+public class SecurityCameraTests {
+
+    private SecurityCamera securityCamera;
+
+    @BeforeEach
+    public void createSecurityCamera() {
+        securityCamera = new SecurityCamera();
+    }
+
+    @Test
+    @DisplayName("get and set Path")
+    public void getAndSetPath() {
+        securityCamera.setPath("ciao mamma");
+
+        assertEquals("ciao mamma", securityCamera.getPath());
+    }
+
+    @Test
+    @DisplayName("get and set On")
+    public void getAndSetOn() {
+        securityCamera.setOn(true);
+
+        assertTrue(securityCamera.isOn());
+    }
+
+    @Test
+    @DisplayName("trigger state")
+    public void triggerState() {
+
+        securityCamera.setOn(true);
+
+        assertTrue(securityCamera.readTriggerState());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
new file mode 100644
index 0000000..0326d70
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
@@ -0,0 +1,46 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor.SensorType;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Sensor Tests")
+public class SensorTests {
+
+    Sensor sensor;
+
+    @BeforeEach
+    public void createSensor() {
+        this.sensor = new Sensor();
+    }
+
+    @Test
+    @DisplayName("get and set sensor")
+    public void getAndSetSensor() {
+        sensor.setSensor(SensorType.LIGHT);
+
+        assertEquals(SensorType.LIGHT, sensor.getSensor());
+    }
+
+    @Test
+    @DisplayName("get and set value")
+    public void getAndSetValue() {
+        sensor.setValue(new BigDecimal(40));
+
+        assertEquals(new BigDecimal(40), sensor.getValue());
+    }
+
+    @Test
+    @DisplayName("to String")
+    public void toStringTest() {
+        sensor.setValue(new BigDecimal(40));
+        sensor.setSensor(SensorType.LIGHT);
+
+        assertEquals("Sensor{value=40, sensor=LIGHT}", sensor.toString());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
new file mode 100644
index 0000000..85dc695
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
@@ -0,0 +1,58 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Curtains tests")
+public class StateTests {
+
+    private DimmableState state;
+
+    @BeforeEach
+    public void createState() {
+        this.state = new DimmableState<>();
+    }
+
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetId() {
+        this.state.setId(20);
+        assertEquals(20, this.state.getId());
+    }
+
+    @Test
+    @DisplayName("get and set device")
+    public void getAndSetDevice() {
+        DimmableLight d = new DimmableLight();
+        this.state.setDevice(d);
+        assertEquals(d, this.state.getDevice());
+    }
+
+    @Test
+    @DisplayName("get and set device id")
+    public void getAndSetDeviceId() {
+        this.state.setDeviceId(30L);
+        assertEquals(30, this.state.getDeviceId());
+    }
+
+    @Test
+    @DisplayName("get and set scene")
+    public void getAndSetScene() {
+        Scene s = new Scene();
+        this.state.setScene(s);
+        assertEquals(s, this.state.getScene());
+    }
+
+    @Test
+    @DisplayName("get and set sceneId")
+    public void getAndSetSceneId() {
+        this.state.setSceneId(50L);
+        assertEquals(50, this.state.getSceneId());
+    }
+}

From 7020f0d692a0f18d3de0db4d59d26100dba140ba Mon Sep 17 00:00:00 2001
From: omenem 
Date: Fri, 15 May 2020 19:01:28 +0200
Subject: [PATCH 058/176] fix

---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
index bc093e0..e72cbf6 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
@@ -2,6 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
+import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
 import javax.validation.constraints.Max;
@@ -19,7 +20,7 @@ public class Dimmable extends Switchable implements RangeTriggerable {
     @ManyToMany(mappedBy = "dimmables", cascade = CascadeType.DETACH)
     @GsonExclude
     @SocketGsonExclude
-    private Set dimmers;
+    private Set dimmers = new HashSet<>();
 
     /** The light intensity value. Goes from 0 (off) to 100 (on) */
     @NotNull

From 3f568c77d32b3ac395c3c07b4337e95f578b5584 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sat, 16 May 2020 18:00:28 +0200
Subject: [PATCH 059/176] more tests

---
 .../sanmarinoes/smarthut/SmartPlugTests.java  | 43 +++++++++++++++++++
 .../smarthut/SwitchableStateTests.java        | 28 ++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
new file mode 100644
index 0000000..921979e
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
@@ -0,0 +1,43 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SmartPlug;
+import java.math.BigDecimal;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("SmartPlug Tests")
+public class SmartPlugTests {
+
+    private SmartPlug smartPlug;
+
+    @BeforeEach
+    public void createSmartPlug() {
+        this.smartPlug = new SmartPlug();
+    }
+
+    @Test
+    @DisplayName("set and get on")
+    public void testOn() {
+        smartPlug.setOn(true);
+
+        assertTrue(smartPlug.isOn());
+    }
+
+    @Test
+    @DisplayName("read trigger state")
+    public void readTriggerState() {
+        smartPlug.setOn(true);
+
+        assertTrue(smartPlug.readTriggerState());
+    }
+
+    @Test
+    @DisplayName("reset total consumption")
+    public void reset() {
+
+        assertEquals(new BigDecimal(0), smartPlug.getTotalConsumption());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
new file mode 100644
index 0000000..c89e04f
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
@@ -0,0 +1,28 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Switchable State Tests")
+public class SwitchableStateTests {
+
+    private SwitchableState switchableState;
+
+    @BeforeEach
+    public void createSwitchableState() {
+        switchableState = new SwitchableState<>();
+    }
+
+    @Test
+    @DisplayName("is on")
+    public void isOn() {
+        switchableState.setOn(true);
+
+        assertTrue(switchableState.isOn());
+    }
+}

From 198be1f66860b8db3f01a146edd6be0e8928bdda Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 17 May 2020 10:16:12 +0200
Subject: [PATCH 060/176] more tests

---
 .../smarthut/ThermostatConditionTests.java    | 53 ++++++++++++
 .../sanmarinoes/smarthut/TriggerTests.java    | 64 ++++++++++++++
 .../sa4/sanmarinoes/smarthut/UserTests.java   | 83 +++++++++++++++++++
 3 files changed, 200 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java
new file mode 100644
index 0000000..d19ce69
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java
@@ -0,0 +1,53 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat.Mode;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition.Operator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("ThermostatCondition Tests")
+public class ThermostatConditionTests {
+
+    private ThermostatCondition thermostatCondition;
+
+    @BeforeEach
+    public void createThermostatCondtion() {
+        this.thermostatCondition = new ThermostatCondition();
+    }
+
+    @Test
+    @DisplayName("get and set mode")
+    public void getAndSetMode() {
+        thermostatCondition.setMode(Thermostat.Mode.IDLE);
+
+        assertEquals(Thermostat.Mode.IDLE, thermostatCondition.getMode());
+    }
+
+    @Test
+    @DisplayName("get and set operator")
+    public void getAndSeOperator() {
+        thermostatCondition.setOperator(Operator.EQUAL);
+
+        assertEquals(Operator.EQUAL, thermostatCondition.getOperator());
+    }
+
+    @Test
+    @DisplayName("get and set operator")
+    public void triggered() {
+        thermostatCondition.setMode(Thermostat.Mode.IDLE);
+        thermostatCondition.setOperator(Operator.EQUAL);
+        Thermostat t = new Thermostat();
+        t.setMode(Mode.IDLE);
+        thermostatCondition.setDevice(t);
+
+        assertTrue(thermostatCondition.triggered());
+
+        thermostatCondition.setOperator(Operator.NOTEQUAL);
+        assertFalse(thermostatCondition.triggered());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
new file mode 100644
index 0000000..3790f3a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
@@ -0,0 +1,64 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Trigger Tests")
+public class TriggerTests {
+
+    private BooleanTrigger booleanTrigger;
+
+    @BeforeEach
+    public void createBooleanTrigger() {
+        booleanTrigger = new BooleanTrigger();
+    }
+
+    @Test
+    @DisplayName("get Kind")
+    public void getKind() {
+        assertEquals("booleanTrigger", booleanTrigger.getKind());
+    }
+
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetId() {
+        booleanTrigger.setId(20);
+        assertEquals(20, booleanTrigger.getId());
+    }
+
+    @Test
+    @DisplayName("get and set device")
+    public void getAndSetDevice() {
+        RegularLight r = new RegularLight();
+        booleanTrigger.setDevice(r);
+        assertEquals(r, booleanTrigger.getDevice());
+    }
+
+    @Test
+    @DisplayName("get and set device id")
+    public void getAndSetDeviceId() {
+        booleanTrigger.setDeviceId(20L);
+        assertEquals(20, booleanTrigger.getDeviceId());
+    }
+
+    @Test
+    @DisplayName("get and set automation")
+    public void getAndSetAutomation() {
+        Automation r = new Automation();
+        booleanTrigger.setAutomation(r);
+        assertEquals(r, booleanTrigger.getAutomation());
+    }
+
+    @Test
+    @DisplayName("get and set automation id")
+    public void getAndSetAutomationId() {
+        booleanTrigger.setAutomationId(20L);
+        assertEquals(20, booleanTrigger.getAutomationId());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
new file mode 100644
index 0000000..1d16b16
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
@@ -0,0 +1,83 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName(" USer Tests")
+public class UserTests {
+
+    private User user;
+
+    @BeforeEach
+    public void createUser() {
+        user = new User();
+    }
+
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetId() {
+        user.setId(20l);
+
+        assertEquals(20, user.getId());
+    }
+
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetName() {
+        user.setName("Paolo Bitta");
+
+        assertEquals("Paolo Bitta", user.getName());
+    }
+
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetUsername() {
+        user.setUsername("PaulB");
+
+        assertEquals("PaulB", user.getUsername());
+    }
+
+    @Test
+    @DisplayName("get and set email")
+    public void getAndSetEmail() {
+        user.setEmail("paolo.bitta@gmail.com");
+
+        assertEquals("paolo.bitta@gmail.com", user.getEmail());
+    }
+
+    @Test
+    @DisplayName("get and set password")
+    public void getAndSetPassword() {
+        user.setPassword("cameraCaffe");
+
+        assertEquals("cameraCaffe", user.getPassword());
+    }
+
+    @Test
+    @DisplayName("get and set enabled")
+    public void getAndSetEnabled() {
+        user.setEnabled(true);
+
+        assertTrue(user.getEnabled());
+    }
+
+    @Test
+    @DisplayName("get and set Cameraenabled")
+    public void getAndSeCameraEnabled() {
+        user.setCameraEnabled(true);
+
+        assertTrue(user.isCameraEnabled());
+    }
+
+    @Test
+    @DisplayName("equals")
+    public void eq() {
+        assertFalse(user.equals(null));
+
+        assertTrue(user.equals(user));
+    }
+}

From 0ce6e84380b80104eb3848687d81dc75162ea1bd Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 17 May 2020 11:26:49 +0200
Subject: [PATCH 061/176] fix

---
 .../sanmarinoes/smarthut/DimmableStateTests.java  |  4 ++--
 .../sanmarinoes/smarthut/RangeConditionTests.java | 10 +++++-----
 .../sanmarinoes/smarthut/RangeTriggerTests.java   | 15 ++++++++-------
 .../smarthut/SwitchableStateTests.java            |  5 ++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
index 87bd181..7dbfe35 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
@@ -11,11 +11,11 @@ import org.junit.jupiter.api.Test;
 @DisplayName("Dimmable State Tests")
 public class DimmableStateTests {
 
-    private DimmableState dimmableState;
+    private DimmableState dimmableState;
 
     @BeforeEach
     public void createDimmableState() {
-        dimmableState = new DimmableState<>();
+        dimmableState = new DimmableState();
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
index 354d6da..1d7772e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
@@ -3,8 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut;
 import static org.junit.jupiter.api.Assertions.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition.Operator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -22,9 +22,9 @@ public class RangeConditionTests {
     @Test
     @DisplayName("set and get operator")
     public void setAndGetOperator() {
-        rangeCondition.setOperator(RangeCondition.Operator.EQUAL);
+        rangeCondition.setOperator(Operator.EQUAL);
 
-        assertEquals(RangeCondition.Operator.EQUAL, rangeCondition.getOperator());
+        assertEquals(Operator.EQUAL, rangeCondition.getOperator());
     }
 
     @Test
@@ -43,10 +43,10 @@ public class RangeConditionTests {
         rangeCondition.setDevice(d);
         rangeCondition.setRange(45D);
 
-        rangeCondition.setOperator(RangeCondition.Operator.EQUAL);
+        rangeCondition.setOperator(Operator.EQUAL);
         assertFalse(rangeCondition.triggered());
 
-        rangeCondition.setOperator(RangeCondition.Operator.LESS);
+        rangeCondition.setOperator(Operator.LESS);
         assertTrue(rangeCondition.triggered());
 
         rangeCondition.setOperator(Operator.GREATER);
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
index 6dda510..4c46d70 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -23,9 +24,9 @@ public class RangeTriggerTests {
     @Test
     @DisplayName("set and get operator")
     public void setAndGetOperator() {
-        rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL);
+        rangeTrigger.setOperator(Operator.EQUAL);
 
-        assertEquals(RangeTrigger.Operator.EQUAL, rangeTrigger.getOperator());
+        assertEquals(Operator.EQUAL, rangeTrigger.getOperator());
     }
 
     @Test
@@ -44,19 +45,19 @@ public class RangeTriggerTests {
         rangeTrigger.setDevice(d);
         rangeTrigger.setRange(45D);
 
-        rangeTrigger.setOperator(RangeTrigger.Operator.EQUAL);
+        rangeTrigger.setOperator(Operator.EQUAL);
         assertFalse(rangeTrigger.triggered());
 
-        rangeTrigger.setOperator(RangeTrigger.Operator.LESS);
+        rangeTrigger.setOperator(Operator.LESS);
         assertTrue(rangeTrigger.triggered());
 
-        rangeTrigger.setOperator(RangeTrigger.Operator.GREATER);
+        rangeTrigger.setOperator(Operator.GREATER);
         assertFalse(rangeTrigger.triggered());
 
-        rangeTrigger.setOperator(RangeTrigger.Operator.LESS_EQUAL);
+        rangeTrigger.setOperator(Operator.LESS_EQUAL);
         assertTrue(rangeTrigger.triggered());
 
-        rangeTrigger.setOperator(RangeTrigger.Operator.GREATER_EQUAL);
+        rangeTrigger.setOperator(Operator.GREATER_EQUAL);
         assertFalse(rangeTrigger.triggered());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
index c89e04f..737053d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
@@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -11,11 +10,11 @@ import org.junit.jupiter.api.Test;
 @DisplayName("Switchable State Tests")
 public class SwitchableStateTests {
 
-    private SwitchableState switchableState;
+    private SwitchableState switchableState;
 
     @BeforeEach
     public void createSwitchableState() {
-        switchableState = new SwitchableState<>();
+        switchableState = new SwitchableState();
     }
 
     @Test

From 940c072711d494a286d2776b6ee7ec931528ccaa Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 17 May 2020 11:33:30 +0200
Subject: [PATCH 062/176] fix

---
 .../usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java  | 2 +-
 .../java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
index 7dbfe35..3c19612 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
@@ -33,6 +33,6 @@ public class DimmableStateTests {
         this.dimmableState.setDevice(d);
         this.dimmableState.setIntensity(30);
         this.dimmableState.apply();
-        assertEquals(30, this.dimmableState.getDevice().getIntensity());
+        assertEquals(30, d.getIntensity());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
index 85dc695..5dd87fa 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
@@ -12,11 +12,11 @@ import org.junit.jupiter.api.Test;
 @DisplayName("Curtains tests")
 public class StateTests {
 
-    private DimmableState state;
+    private DimmableState state;
 
     @BeforeEach
     public void createState() {
-        this.state = new DimmableState<>();
+        this.state = new DimmableState();
     }
 
     @Test

From c5b3a57faa10560cb69fc5305ae1f72be3f4c8fe Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 17 May 2020 11:52:37 +0200
Subject: [PATCH 063/176] fix

---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
index 5dd87fa..3c5ef86 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
@@ -19,13 +19,6 @@ public class StateTests {
         this.state = new DimmableState();
     }
 
-    @Test
-    @DisplayName("get and set id")
-    public void getAndSetId() {
-        this.state.setId(20);
-        assertEquals(20, this.state.getId());
-    }
-
     @Test
     @DisplayName("get and set device")
     public void getAndSetDevice() {

From bc7b30f3eae67af3f2a7b01e9438bdf4cf35c49f Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 17 May 2020 12:49:40 +0200
Subject: [PATCH 064/176] Fixed lombok in AutomationFastUpdateRequest

---
 .../dto/AutomationFastUpdateRequest.java      | 38 +++++++++----------
 .../AutomationFastUpdateRequestTest.java      | 36 +++++++++---------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index f086fef..667645e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -6,37 +6,37 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 @Data
-@Getter
-@Setter
 public class AutomationFastUpdateRequest {
     public abstract static class TriggerDTO {
-        @NotNull public long deviceId;
+        @NotNull @Getter @Setter private long deviceId;
 
         public abstract Trigger toModel();
     }
 
     public static class BooleanTriggerDTO extends TriggerDTO {
-        @NotNull public boolean on;
+        @NotNull @Getter @Setter private boolean on;
 
         @Override
         public Trigger toModel() {
             BooleanTrigger t = new BooleanTrigger();
-            t.setDeviceId(this.deviceId);
+            t.setDeviceId(this.getDeviceId());
             t.setOn(this.on);
             return t;
         }
     }
 
     public static class RangeTriggerDTO extends TriggerDTO {
-        @NotNull private Operator operator;
-        @NotNull private double range;
+        @NotNull @Getter @Setter private Operator operator;
+        @NotNull @Getter @Setter private double range;
 
         @Override
         public Trigger toModel() {
             RangeTrigger t = new RangeTrigger();
-            t.setDeviceId(this.deviceId);
+            t.setDeviceId(this.getDeviceId());
             t.setOperator(this.operator);
             t.setRange(this.range);
             return t;
@@ -44,11 +44,11 @@ public class AutomationFastUpdateRequest {
     }
 
     public static class ScenePriorityDTO {
-        @NotNull public long sceneId;
+        @NotNull @Getter @Setter private long sceneId;
 
         @NotNull
         @Min(0)
-        public Integer priority;
+        private @Getter @Setter Integer priority;
 
         public ScenePriority toModel() {
             ScenePriority s = new ScenePriority();
@@ -59,19 +59,19 @@ public class AutomationFastUpdateRequest {
     }
 
     public abstract static class ConditionDTO {
-        @NotNull public long deviceId;
+        @NotNull @Getter @Setter private long deviceId;
 
         public abstract Condition toModel();
     }
 
     public static class BooleanConditionDTO extends ConditionDTO {
 
-        @NotNull public boolean on;
+        @NotNull @Getter @Setter private boolean on;
 
         @Override
         public Condition toModel() {
             BooleanCondition t = new BooleanCondition();
-            t.setDeviceId(this.deviceId);
+            t.setDeviceId(this.getDeviceId());
             t.setOn(this.on);
             return t;
         }
@@ -79,13 +79,13 @@ public class AutomationFastUpdateRequest {
 
     public static class RangeConditionDTO extends ConditionDTO {
 
-        @NotNull private Operator operator;
-        @NotNull private double range;
+        @NotNull @Getter @Setter private Operator operator;
+        @NotNull @Getter @Setter private double range;
 
         @Override
         public Condition toModel() {
             RangeCondition t = new RangeCondition();
-            t.setDeviceId(this.deviceId);
+            t.setDeviceId(this.getDeviceId());
             t.setOperator(this.operator);
             t.setRange(this.range);
             return t;
@@ -94,13 +94,13 @@ public class AutomationFastUpdateRequest {
 
     public static class ThermostatConditionDTO extends ConditionDTO {
 
-        @NotNull private ThermostatCondition.Operator operator;
-        @NotNull private Thermostat.Mode mode;
+        @NotNull @Getter @Setter private ThermostatCondition.Operator operator;
+        @NotNull @Getter @Setter private Thermostat.Mode mode;
 
         @Override
         public Condition toModel() {
             ThermostatCondition t = new ThermostatCondition();
-            t.setDeviceId(this.deviceId);
+            t.setDeviceId(this.getDeviceId());
             t.setOperator(this.operator);
             t.setMode(this.mode);
             return t;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
index 013f067..4f10fc6 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
@@ -21,11 +21,11 @@ public class AutomationFastUpdateRequestTest {
     @DisplayName(" checking boolean trigger ")
     public void booleanTriggerDTOTest() {
         booleanTriggerDTO = new AutomationFastUpdateRequest.BooleanTriggerDTO();
-        booleanTriggerDTO.on = true;
-        booleanTriggerDTO.deviceId = 42;
+        booleanTriggerDTO.setOn(true);
+        booleanTriggerDTO.setDeviceId(42);
         BooleanTrigger booleanTrigger = (BooleanTrigger) booleanTriggerDTO.toModel();
-        assertEquals(booleanTrigger.isOn(), booleanTriggerDTO.on);
-        assertEquals(booleanTrigger.getDeviceId(), booleanTriggerDTO.deviceId);
+        assertEquals(booleanTrigger.isOn(), booleanTriggerDTO.isOn());
+        assertEquals(booleanTrigger.getDeviceId(), booleanTriggerDTO.getDeviceId());
     }
 
     @Test
@@ -33,37 +33,37 @@ public class AutomationFastUpdateRequestTest {
     public void rangeTriggerDTOTest() {
         rangeTriggerDTO = new AutomationFastUpdateRequest.RangeTriggerDTO();
         rangeTriggerDTO.setOperator(Operator.EQUAL);
-        rangeTriggerDTO.deviceId = 420;
+        rangeTriggerDTO.setDeviceId(420);
         rangeTriggerDTO.setRange(12);
 
         RangeTrigger rangeTrigger = (RangeTrigger) rangeTriggerDTO.toModel();
         assertEquals(rangeTrigger.getOperator(), rangeTriggerDTO.getOperator());
         assertEquals(rangeTrigger.getRange(), rangeTriggerDTO.getRange());
-        assertEquals(rangeTrigger.getDeviceId(), rangeTriggerDTO.deviceId);
+        assertEquals(rangeTrigger.getDeviceId(), rangeTriggerDTO.getDeviceId());
     }
 
     @Test
     @DisplayName(" checking scene priority ")
     public void scenePriorityDTOTest() {
         scenePriorityDTO = new AutomationFastUpdateRequest.ScenePriorityDTO();
-        scenePriorityDTO.priority = 67;
-        scenePriorityDTO.sceneId = 21;
+        scenePriorityDTO.setPriority(67);
+        scenePriorityDTO.setSceneId(21);
 
         ScenePriority scenePriority = scenePriorityDTO.toModel();
-        assertEquals(scenePriority.getPriority(), scenePriorityDTO.priority);
-        assertEquals(scenePriority.getSceneId(), scenePriorityDTO.priority);
+        assertEquals(scenePriority.getPriority(), scenePriorityDTO.getPriority());
+        assertEquals(scenePriority.getSceneId(), scenePriorityDTO.getSceneId());
     }
 
     @Test
     @DisplayName(" checking boolean condition ")
     public void booleanConditionDTOTest() {
         booleanConditionDTO = new AutomationFastUpdateRequest.BooleanConditionDTO();
-        booleanConditionDTO.on = true;
-        booleanConditionDTO.deviceId = 17;
+        booleanConditionDTO.setOn(true);
+        booleanConditionDTO.setDeviceId(17);
 
         BooleanCondition booleanCondition = (BooleanCondition) booleanConditionDTO.toModel();
-        assertEquals(booleanCondition.isOn(), booleanConditionDTO.on);
-        assertEquals(booleanCondition.getDeviceId(), booleanConditionDTO.deviceId);
+        assertEquals(booleanCondition.isOn(), booleanConditionDTO.isOn());
+        assertEquals(booleanCondition.getDeviceId(), booleanConditionDTO.getDeviceId());
     }
 
     @Test
@@ -72,19 +72,19 @@ public class AutomationFastUpdateRequestTest {
         rangeConditionDTO = new AutomationFastUpdateRequest.RangeConditionDTO();
         rangeConditionDTO.setOperator(Operator.LESS);
         rangeConditionDTO.setRange(82.01);
-        rangeConditionDTO.deviceId = 13;
+        rangeConditionDTO.setDeviceId(13);
 
         RangeCondition rangeCondition = (RangeCondition) rangeConditionDTO.toModel();
         assertEquals(rangeCondition.getOperator(), rangeConditionDTO.getOperator());
         assertEquals(rangeCondition.getRange(), rangeConditionDTO.getRange());
-        assertEquals(rangeCondition.getDeviceId(), rangeConditionDTO.deviceId);
+        assertEquals(rangeCondition.getDeviceId(), rangeConditionDTO.getDeviceId());
     }
 
     @Test
     @DisplayName(" checking thermostat condition ")
     public void thermostatConditionDTOTest() {
         thermostatConditionDTO = new AutomationFastUpdateRequest.ThermostatConditionDTO();
-        thermostatConditionDTO.deviceId = 25;
+        thermostatConditionDTO.setDeviceId(25);
         thermostatConditionDTO.setOperator(ThermostatCondition.Operator.EQUAL);
         thermostatConditionDTO.setMode(Thermostat.Mode.HEATING);
 
@@ -92,6 +92,6 @@ public class AutomationFastUpdateRequestTest {
                 (ThermostatCondition) thermostatConditionDTO.toModel();
         assertEquals(thermostatCondition.getMode(), thermostatConditionDTO.getMode());
         assertEquals(thermostatCondition.getOperator(), thermostatConditionDTO.getOperator());
-        assertEquals(thermostatCondition.getDeviceId(), thermostatConditionDTO.deviceId);
+        assertEquals(thermostatCondition.getDeviceId(), thermostatConditionDTO.getDeviceId());
     }
 }

From 4e35aa4a7588ac50ec5648a8788b5a23ef87e2f5 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 17 May 2020 13:26:51 +0200
Subject: [PATCH 065/176] Tests on exception classes

---
 .../dto/ThermostatConditionSaveRequest.java   | 41 +----------
 .../sanmarinoes/smarthut/ExceptionTests.java  | 72 +++++++++++++++++++
 2 files changed, 74 insertions(+), 39 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java
index 8c56f2d..c45b482 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequest.java
@@ -1,13 +1,12 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat.Mode;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition.Operator;
 import javax.validation.constraints.NotNull;
+import lombok.Data;
 
+@Data
 public class ThermostatConditionSaveRequest {
-
     @NotNull private long id;
 
     @NotNull private Long deviceId;
@@ -17,40 +16,4 @@ public class ThermostatConditionSaveRequest {
     @NotNull private ThermostatCondition.Operator operator;
 
     @NotNull private Thermostat.Mode mode;
-
-    public long getId() {
-        return id;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public Long getAutomationId() {
-        return automationId;
-    }
-
-    public void setAutomationId(Long automationId) {
-        this.automationId = automationId;
-    }
-
-    public Operator getOperator() {
-        return operator;
-    }
-
-    public void setOperator(Operator operator) {
-        this.operator = operator;
-    }
-
-    public Mode getMode() {
-        return mode;
-    }
-
-    public void setMode(Mode mode) {
-        this.mode = mode;
-    }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java
new file mode 100644
index 0000000..07ff076
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java
@@ -0,0 +1,72 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.*;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@DisplayName("Exception tests")
+public class ExceptionTests {
+    @Test
+    public void testBadData() {
+        try {
+            throw new BadDataException("message");
+        } catch (BadDataException e) {
+            assertEquals(e.getMessage(), "message");
+        }
+    }
+
+    @Test
+    public void testDuplicateRegistration() {
+        try {
+            throw new DuplicateRegistrationException();
+        } catch (DuplicateRegistrationException e) {
+            assertEquals(e.getMessage(), "Email or username already belonging to another user");
+        }
+    }
+
+    @Test
+    public void testDuplicateState() {
+        try {
+            throw new DuplicateStateException();
+        } catch (DuplicateStateException e) {
+            assertEquals(
+                    e.getMessage(),
+                    "Cannot create state since it has already been created for this scene and this device");
+        }
+    }
+
+    @Test
+    public void testEmailTokenNotFound() {
+        try {
+            throw new EmailTokenNotFoundException();
+        } catch (EmailTokenNotFoundException e) {
+            assertEquals(e.getMessage(), "Email verification token not found in DB");
+        }
+    }
+
+    @Test
+    public void testNotFound() {
+        try {
+            throw new NotFoundException();
+        } catch (NotFoundException e) {
+            assertEquals(e.getMessage(), "Not found");
+        }
+
+        try {
+            throw new NotFoundException("message");
+        } catch (NotFoundException e) {
+            assertEquals(e.getMessage(), "message not found");
+        }
+    }
+
+    @Test
+    public void testUserNotFound() {
+        try {
+            throw new UserNotFoundException();
+        } catch (UserNotFoundException e) {
+            assertEquals(e.getMessage(), "No user found with given email");
+        }
+    }
+}

From eeec7269660fc1725cc324fa215b4fb0374325d7 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 17 May 2020 13:56:54 +0200
Subject: [PATCH 066/176] Tests on Utils and UserResponse

---
 .../smarthut/UserResponseTests.java           | 21 ++++++++
 .../sa4/sanmarinoes/smarthut/UtilsTests.java  | 48 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
new file mode 100644
index 0000000..010976c
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
@@ -0,0 +1,21 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import org.junit.jupiter.api.Test;
+
+public class UserResponseTests {
+    @Test
+    public void testUserResponse() {
+        User u = new User();
+        u.setEmail("email@example.com");
+        u.setId(42L);
+        u.setUsername("username");
+        UserResponse us = UserResponse.fromUser(u);
+        assertEquals(us.getName(), u.getName());
+        assertEquals(us.getId(), u.getId());
+        assertEquals(us.getUsername(), u.getUsername());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
new file mode 100644
index 0000000..0ac7d71
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
@@ -0,0 +1,48 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
+import java.security.Principal;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+public class UtilsTests {
+
+    @Test
+    public void testToList() {
+        List hormannTitles = List.of("Prof.", "Dr.", "Kai (spiritual leader)");
+        assertThat(Utils.toList(hormannTitles))
+                .containsExactly(hormannTitles.get(0), hormannTitles.get(1), hormannTitles.get(2));
+    }
+
+    @Test
+    public void testReturnIfGuest() {
+        Principal principal = Mockito.mock(Principal.class);
+        UserRepository userRepository = Mockito.mock(UserRepository.class);
+        User host = new User();
+        User guest = new User();
+        host.getGuests().add(guest);
+
+        when(userRepository.findById(1L)).thenReturn(Optional.of(host));
+        when(userRepository.findById(2L)).thenReturn(Optional.empty());
+        when(userRepository.findByUsername("user")).thenReturn(guest);
+        when(principal.getName()).thenReturn("user");
+
+        try {
+            assertThat(Utils.returnIfGuest(userRepository, "toReturn", 1L, principal))
+                    .isEqualTo("toReturn");
+        } catch (NotFoundException e) {
+            fail(e.getMessage());
+        }
+
+        assertThatThrownBy(() -> Utils.returnIfGuest(userRepository, "toReturn", 2L, principal))
+                .isInstanceOf(NotFoundException.class);
+    }
+}

From 0ce873dc52af28a5603bccdca4b12dff90198c69 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 18 May 2020 10:52:58 +0200
Subject: [PATCH 067/176] Working on DeviceService tests

---
 .../smarthut/models/BooleanTriggerable.java   |   2 +-
 .../smarthut/models/Condition.java            |   2 +
 .../smarthut/models/RangeTriggerable.java     |   2 +-
 .../sanmarinoes/smarthut/models/Trigger.java  |   4 +-
 .../smarthut/models/Triggerable.java          |   3 +
 .../smarthut/service/AutomationService.java   |   6 +-
 .../smarthut/service/DeviceService.java       |   4 +-
 .../smarthut/DeviceServiceTests.java          | 118 ++++++++++++++++++
 8 files changed, 133 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Triggerable.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerable.java
index 6ff219f..9132f36 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerable.java
@@ -1,5 +1,5 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-public interface BooleanTriggerable {
+public interface BooleanTriggerable extends Triggerable {
     boolean readTriggerState();
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
index a063ca6..476fefc 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
@@ -11,6 +11,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
 @Entity
@@ -47,6 +48,7 @@ public abstract class Condition {
     @ManyToOne
     @JoinColumn(name = "automation_id", updatable = false, insertable = false)
     @GsonExclude
+    @EqualsAndHashCode.Exclude
     private Automation automation;
 
     @Column(name = "automation_id", nullable = false)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerable.java
index 489a763..c850541 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerable.java
@@ -1,5 +1,5 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-public interface RangeTriggerable {
+public interface RangeTriggerable extends Triggerable {
     double readTriggerState();
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
index 3633a35..f70a8b0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
@@ -3,10 +3,11 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import io.swagger.annotations.ApiModelProperty;
 import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public abstract class Trigger {
+public abstract class Trigger {
 
     @Transient private String kind;
 
@@ -41,6 +42,7 @@ public abstract class Trigger {
     @ManyToOne
     @JoinColumn(name = "automation_id", updatable = false, insertable = false)
     @GsonExclude
+    @EqualsAndHashCode.Exclude
     private Automation automation;
 
     @Column(name = "automation_id", nullable = false)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Triggerable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Triggerable.java
new file mode 100644
index 0000000..1215212
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Triggerable.java
@@ -0,0 +1,3 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
+
+public interface Triggerable {}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
index 9eaf401..8668e1a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
@@ -8,17 +8,17 @@ import org.springframework.stereotype.Component;
 @Component
 public class AutomationService {
     private final AutomationRepository automationRepository;
-    private final TriggerRepository> triggerRepository;
+    private final TriggerRepository> triggerRepository;
 
     @Autowired
     public AutomationService(
             AutomationRepository automationRepository,
-            TriggerRepository> triggerRepository) {
+            TriggerRepository> triggerRepository) {
         this.automationRepository = automationRepository;
         this.triggerRepository = triggerRepository;
     }
 
-    public List> findTriggersByDeviceId(Long deviceId) {
+    public List> findTriggersByDeviceId(Long deviceId) {
         return triggerRepository.findAllByDeviceId(deviceId);
     }
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
index ea21d5d..c28ad1f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
@@ -52,10 +52,10 @@ public class DeviceService {
         if (!r.getId().equals(roomId)) throw new IllegalStateException();
     }
 
-    private void triggerTriggers(Device device, final String username) {
+    public void triggerTriggers(Device device, final String username) {
 
         final long deviceId = device.getId();
-        final List> triggers = automationService.findTriggersByDeviceId(deviceId);
+        final List> triggers = automationService.findTriggersByDeviceId(deviceId);
 
         triggers.stream()
                 .filter(Trigger::triggered)
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java
new file mode 100644
index 0000000..6de9170
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java
@@ -0,0 +1,118 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.*;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class DeviceServiceTests {
+
+    @Mock private DeviceRepository deviceRepository;
+
+    @Mock private SceneService sceneService;
+
+    @Mock private RoomRepository roomRepository;
+
+    @Mock private AutomationService automationService;
+
+    @Mock private EagerUserRepository userRepository;
+
+    @Mock private DevicePopulationService devicePopulationService;
+
+    @Mock private DevicePropagationService devicePropagationService;
+
+    @Mock private ConditionRepository> conditionRepository;
+
+    @InjectMocks private DeviceService deviceService;
+
+    @Test
+    public void testThrowIfRoomNotOwned() {
+        final Room r = new Room();
+        r.setId(1L);
+
+        when(roomRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(r));
+        when(roomRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
+
+        try {
+            deviceService.throwIfRoomNotOwned(1L, "user");
+        } catch (NotFoundException e) {
+            fail(e.getMessage());
+        }
+
+        assertThatThrownBy(() -> deviceService.throwIfRoomNotOwned(2L, "user"))
+                .isInstanceOf(NotFoundException.class);
+
+        r.setId(2L);
+
+        assertThatThrownBy(() -> deviceService.throwIfRoomNotOwned(1L, "user"))
+                .isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void triggerTriggers() {
+        final RegularLight r = new RegularLight();
+        r.setId(1L);
+        r.setOn(true);
+
+        final BooleanTrigger b = new BooleanTrigger();
+        b.setId(2L);
+        b.setDevice(r);
+        b.setOn(true);
+        b.setDeviceId(r.getId());
+
+        final BooleanCondition c = new BooleanCondition();
+        c.setId(3L);
+        c.setDevice(r);
+        c.setOn(true);
+        c.setDeviceId(r.getId());
+
+        final Scene s = new Scene();
+        s.setId(4L);
+
+        final Automation a = new Automation();
+        a.setId(5L);
+
+        final ScenePriority sp = new ScenePriority();
+        sp.setSceneId(s.getId());
+        sp.setScene(s);
+        sp.setAutomationId(a.getId());
+        sp.setAutomation(a);
+
+        a.getTriggers().add(b);
+        b.setAutomation(a);
+        b.setAutomationId(a.getId());
+
+        a.getConditions().add(c);
+        c.setAutomation(a);
+        c.setAutomationId(a.getId());
+
+        a.getScenes().add(sp);
+
+        when(automationService.findTriggersByDeviceId(1L)).thenReturn(List.of(b));
+        when(conditionRepository.findAllByAutomationId(5L)).thenReturn(List.of(c));
+        when(automationService.findByVerifiedId(5L)).thenReturn(a);
+        when(sceneService.findByValidatedId(4L)).thenReturn(s);
+
+        final boolean[] passed = new boolean[1];
+        when(sceneService.apply(s, "user", true))
+                .thenAnswer(
+                        invocation -> {
+                            passed[0] = true;
+                            return null;
+                        });
+
+        deviceService.triggerTriggers(r, "user");
+
+        assertThat(passed[0]).isTrue();
+    }
+}

From be5ab5b4b3674d8e957b9c8016fd835ce24b852c Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 18 May 2020 11:54:08 +0200
Subject: [PATCH 068/176] Fixed lombok

---
 .../inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java   | 2 ++
 .../inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
index bd86cd3..59a089a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
@@ -7,9 +7,11 @@ import javax.persistence.Enumerated;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class SensorSaveRequest {
     /** The type of this sensor */
     @NotNull
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
index e3529bd..4409a38 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
@@ -22,8 +22,8 @@ public class SensorSaveRequestTests {
     @Test
     @DisplayName("test setRoomId")
     public void testSetRoomId() {
-        sensor.setRoomId(42l);
-        assertEquals(42l, sensor.getRoomId());
+        sensor.setRoomId(42L);
+        assertEquals(42L, sensor.getRoomId());
     }
 
     @Test

From 266fc3af9e25d0abce633d9c964166f2aef2dbc7 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 18 May 2020 11:58:33 +0200
Subject: [PATCH 069/176] fixed sensorsaverequest

---
 .../sanmarinoes/smarthut/SensorSaveRequestTests.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
index 4409a38..7a219b1 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
@@ -26,6 +27,17 @@ public class SensorSaveRequestTests {
         assertEquals(42L, sensor.getRoomId());
     }
 
+    @Test
+    @DisplayName("test constructor")
+    public void testConstructorNotEmpty() {
+        SensorSaveRequest newSaveRequest =
+                new SensorSaveRequest(Sensor.SensorType.HUMIDITY, new BigDecimal(12), 12L, "name");
+        assertNotNull(newSaveRequest.getSensor());
+        assertNotNull(newSaveRequest.getName());
+        assertNotNull(newSaveRequest.getRoomId());
+        assertNotNull(newSaveRequest.getValue());
+    }
+
     @Test
     @DisplayName("test setName")
     public void testSetName() {

From 319206334ed823cad1c1b6d16357b40f767b4a67 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 18 May 2020 12:20:34 +0200
Subject: [PATCH 070/176] Partial tests on DeviceService

---
 .../{ => service}/DeviceServiceTests.java     | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => service}/DeviceServiceTests.java (81%)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
similarity index 81%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
index 6de9170..683ec65 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DeviceServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
@@ -1,11 +1,11 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.service.*;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -115,4 +115,25 @@ public class DeviceServiceTests {
 
         assertThat(passed[0]).isTrue();
     }
+
+    @Test
+    public void testSaveAsGuest() throws NotFoundException {
+        Thermostat t = new Thermostat();
+
+        User u = new User();
+        u.setUsername("user");
+
+        User host = new User();
+        host.setId(1L);
+        host.setUsername("host");
+        host.getGuests().add(u);
+        u.getHosts().add(host);
+
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(userRepository.findById(1L)).thenReturn(Optional.of(host));
+        doNothing().when(devicePropagationService).renameIfDuplicate(t, "host");
+        when(deviceRepository.save(t)).thenAnswer(ta -> ta.getArguments()[0]);
+
+        assertThat(deviceService.saveAsGuest(t, "user", 1L)).isEqualTo(t);
+    }
 }

From 0b1ff0f71e4388ef858f915e479bbf936b600b8f Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 18 May 2020 13:16:34 +0200
Subject: [PATCH 071/176] More tests

---
 .../smarthut/config/GsonTests.java            | 41 +++++++++++++++++++
 .../smarthut/config/SpringFoxConfigTests.java | 18 ++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfigTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java
new file mode 100644
index 0000000..dd48ae5
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java
@@ -0,0 +1,41 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class GsonTests {
+
+    private final Gson gson = GsonConfig.gson();
+
+    @Test
+    public void testGson() {
+        BooleanTrigger b = new BooleanTrigger();
+        b.setId(1L);
+        String json = gson.toJson(b);
+        JsonObject o = gson.fromJson(json, JsonObject.class);
+        assertThat(o.get("kind")).isNotNull();
+        assertThat(o.get("kind").getAsString()).isEqualTo("booleanTrigger");
+
+        AutomationFastUpdateRequest a = new AutomationFastUpdateRequest();
+        AutomationFastUpdateRequest.BooleanTriggerDTO bt =
+                new AutomationFastUpdateRequest.BooleanTriggerDTO();
+        bt.setDeviceId(42L);
+        a.setTriggers(List.of(bt));
+
+        AutomationFastUpdateRequest a2 =
+                gson.fromJson(gson.toJson(a), AutomationFastUpdateRequest.class);
+        AutomationFastUpdateRequest.TriggerDTO t = a2.getTriggers().get(0);
+
+        assertThat(t).isExactlyInstanceOf(AutomationFastUpdateRequest.BooleanTriggerDTO.class);
+        assertThat(t.getDeviceId()).isEqualTo(42L);
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfigTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfigTests.java
new file mode 100644
index 0000000..9b9cba3
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfigTests.java
@@ -0,0 +1,18 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class SpringFoxConfigTests {
+
+    private final SpringFoxConfig springFoxConfig = new SpringFoxConfig();
+
+    @Test
+    public void testApi() {
+        assertThat(springFoxConfig.api()).isNotNull();
+    }
+}

From 4fde95231b22405909dfe068826525b9e3409e87 Mon Sep 17 00:00:00 2001
From: Claudio Maggioni 
Date: Mon, 18 May 2020 17:58:38 +0200
Subject: [PATCH 072/176] fixed stuff

---
 .../smarthut/config/GsonConfig.java           |  40 ++-----
 .../config/RuntimeTypeAdapterFactory.java     |   8 +-
 .../controller/AuthenticationController.java  |   3 +-
 .../controller/AutomationController.java      |  19 ++--
 .../BooleanConditionController.java           |   9 +-
 .../controller/BooleanTriggerController.java  |   9 +-
 .../controller/ButtonDimmerController.java    |   5 +-
 .../controller/GuestEnabledController.java    |   4 +-
 .../InputDeviceConnectionController.java      |   5 +-
 .../controller/KnobDimmerController.java      |   5 +-
 .../controller/RangeConditionController.java  |   9 +-
 .../controller/RangeTriggerController.java    |   9 +-
 .../controller/RegularLightController.java    |  10 +-
 .../smarthut/controller/RoomController.java   |   4 +-
 .../controller/ScenePriorityController.java   |   9 +-
 .../controller/SecurityCameraController.java  |   9 +-
 .../smarthut/controller/SensorController.java |   6 +-
 .../controller/SmartPlugController.java       |   2 +-
 .../smarthut/controller/SwitchController.java |   7 +-
 .../controller/SwitchableStateController.java |   7 +-
 .../ThermostatConditionController.java        |   9 +-
 .../controller/ThermostatController.java      |   2 +-
 .../dto/AutomationFastUpdateRequest.java      | 104 +-----------------
 .../smarthut/dto/PasswordResetRequest.java    |   4 +-
 .../dto/automation/BooleanConditionDTO.java   |  20 ++++
 .../dto/automation/BooleanTriggerDTO.java     |  19 ++++
 .../smarthut/dto/automation/ConditionDTO.java |  12 ++
 .../dto/automation/RangeConditionDTO.java     |  23 ++++
 .../dto/automation/RangeTriggerDTO.java       |  22 ++++
 .../dto/automation/ScenePriorityDTO.java      |  22 ++++
 .../automation/ThermostatConditionDTO.java    |  29 +++++
 .../smarthut/dto/automation/TriggerDTO.java   |  12 ++
 .../smarthut/models/Condition.java            |   9 +-
 .../smarthut/models/ConfirmationToken.java    |  11 +-
 .../smarthut/models/DimmableLight.java        |   2 +-
 .../smarthut/models/OutputDevice.java         |   4 +-
 .../smarthut/models/ScenePriority.java        |   9 +-
 .../smarthut/models/UserRepository.java       |   2 +-
 .../smarthut/service/AutomationService.java   |   5 +-
 .../service/DevicePropagationService.java     |   5 +-
 .../service/JWTUserDetailsService.java        |   1 -
 .../smarthut/socket/SensorSocketEndpoint.java |   4 +-
 .../AutomationFastUpdateRequestTest.java      |  21 ++--
 .../smarthut/config/GsonTests.java            |   9 +-
 44 files changed, 253 insertions(+), 286 deletions(-)
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ConditionDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeConditionDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeTriggerDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ThermostatConditionDTO.java
 create mode 100644 src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/TriggerDTO.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java
index d3c0c50..2e5e9f9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonConfig.java
@@ -1,11 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import com.google.gson.*;
 import java.lang.reflect.Type;
 import org.springframework.context.annotation.Bean;
@@ -34,30 +30,16 @@ public class GsonConfig {
                 RuntimeTypeAdapterFactory.of(State.class, "kind")
                         .registerSubtype(SwitchableState.class, "switchableState")
                         .registerSubtype(DimmableState.class, "dimmableState");
-        RuntimeTypeAdapterFactory
-                runtimeTypeAdapterFactoryII =
-                        RuntimeTypeAdapterFactory.of(
-                                        AutomationFastUpdateRequest.TriggerDTO.class, "kind")
-                                .registerSubtype(
-                                        AutomationFastUpdateRequest.BooleanTriggerDTO.class,
-                                        "booleanTrigger")
-                                .registerSubtype(
-                                        AutomationFastUpdateRequest.RangeTriggerDTO.class,
-                                        "rangeTrigger");
+        RuntimeTypeAdapterFactory runtimeTypeAdapterFactoryII =
+                RuntimeTypeAdapterFactory.of(TriggerDTO.class, "kind")
+                        .registerSubtype(BooleanTriggerDTO.class, "booleanTrigger")
+                        .registerSubtype(RangeTriggerDTO.class, "rangeTrigger");
 
-        RuntimeTypeAdapterFactory
-                runtimeTypeAdapterFactoryIII =
-                        RuntimeTypeAdapterFactory.of(
-                                        AutomationFastUpdateRequest.ConditionDTO.class, "kind")
-                                .registerSubtype(
-                                        AutomationFastUpdateRequest.BooleanConditionDTO.class,
-                                        "booleanCondition")
-                                .registerSubtype(
-                                        AutomationFastUpdateRequest.RangeConditionDTO.class,
-                                        "rangeCondition")
-                                .registerSubtype(
-                                        AutomationFastUpdateRequest.ThermostatConditionDTO.class,
-                                        "thermostatCondition");
+        RuntimeTypeAdapterFactory runtimeTypeAdapterFactoryIII =
+                RuntimeTypeAdapterFactory.of(ConditionDTO.class, "kind")
+                        .registerSubtype(BooleanConditionDTO.class, "booleanCondition")
+                        .registerSubtype(RangeConditionDTO.class, "rangeCondition")
+                        .registerSubtype(ThermostatConditionDTO.class, "thermostatCondition");
 
         builder.registerTypeAdapterFactory(runtimeTypeAdapterFactory);
         builder.registerTypeAdapterFactory(runtimeTypeAdapterFactoryII);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
index aa33517..c0245d1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
@@ -1,12 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.TypeAdapter;
-import com.google.gson.TypeAdapterFactory;
+import com.google.gson.*;
 import com.google.gson.internal.Streams;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java
index 7179130..da84571 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java
@@ -5,7 +5,8 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTResponse;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UnauthorizedException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UserNotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.JWTUserDetailsService;
 import java.security.Principal;
 import javax.validation.Valid;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java
index e82bce2..d05c955 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java
@@ -2,6 +2,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.ConditionDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.ScenePriorityDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.TriggerDTO;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.security.Principal;
@@ -10,15 +13,7 @@ import java.util.stream.Collectors;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
@@ -93,21 +88,21 @@ public class AutomationController {
                 triggerRepository.saveAll(
                         req.getTriggers()
                                 .stream()
-                                .map(AutomationFastUpdateRequest.TriggerDTO::toModel)
+                                .map(TriggerDTO::toModel)
                                 .map(t -> t.setAutomationId(a.getId()))
                                 .collect(Collectors.toList()));
         Iterable ss =
                 sceneRepository.saveAll(
                         req.getScenes()
                                 .stream()
-                                .map(AutomationFastUpdateRequest.ScenePriorityDTO::toModel)
+                                .map(ScenePriorityDTO::toModel)
                                 .collect(Collectors.toList()));
 
         Iterable> cc =
                 conditionRepository.saveAll(
                         req.getConditions()
                                 .stream()
-                                .map(AutomationFastUpdateRequest.ConditionDTO::toModel)
+                                .map(ConditionDTO::toModel)
                                 .map(t -> t.setAutomationId(a.getId()))
                                 .collect(Collectors.toList()));
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
index e605043..c776a70 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionController.java
@@ -8,14 +8,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
index d31b8e2..3147fb8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
@@ -8,14 +8,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
index 54ea066..8e3b313 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
@@ -3,7 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ButtonDimmerDimRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveReguest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmerRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.Set;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java
index 1aa2e7c..6336a4e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java
@@ -3,7 +3,9 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.returnIfGuest;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import java.security.Principal;
 
 public abstract class GuestEnabledController {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
index 4b92125..efde6e5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
@@ -3,7 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Connectable;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.InputDevice;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.OutputDevice;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.ArrayList;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
index f80e1fd..c91144e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
@@ -3,7 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveReguest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.KnobDimmerDimRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmerRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.Set;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
index ea9a911..5ac5f0b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionController.java
@@ -8,14 +8,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
index c8c5589..e04aada 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
@@ -8,14 +8,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
index 6da88d8..29364a1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
@@ -12,15 +12,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java
index 79b61d2..2bba6c2 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java
@@ -8,10 +8,10 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.security.Principal;
-import java.util.*;
+import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.*;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java
index 98ead6a..230e396 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityController.java
@@ -8,14 +8,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
index 781b46a..fe29bf7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
@@ -10,14 +10,7 @@ import java.security.Principal;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
index ff1677d..62581b3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
@@ -2,15 +2,15 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SensorRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.SensorService;
 import java.math.BigDecimal;
 import java.security.Principal;
-import java.util.*;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.*;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
index 43d659b..04e1dd2 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java
@@ -8,7 +8,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.*;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
index 299c7e5..87368db 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
@@ -3,13 +3,16 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveReguest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchOperationRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switch;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switchable;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.*;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java
index 2fc9f18..64bb8cb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateController.java
@@ -7,12 +7,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableStateRepository;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java
index a6d118a..5852c9f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionController.java
@@ -8,14 +8,7 @@ import java.util.List;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
index 72b4934..d45ba96 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
@@ -9,7 +9,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.service.ThermostatPopulationService;
 import java.security.Principal;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.*;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
index 667645e..b2c90d4 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
@@ -1,116 +1,18 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.ConditionDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.ScenePriorityDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.TriggerDTO;
 import java.util.List;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 @Data
 public class AutomationFastUpdateRequest {
-    public abstract static class TriggerDTO {
-        @NotNull @Getter @Setter private long deviceId;
-
-        public abstract Trigger toModel();
-    }
-
-    public static class BooleanTriggerDTO extends TriggerDTO {
-        @NotNull @Getter @Setter private boolean on;
-
-        @Override
-        public Trigger toModel() {
-            BooleanTrigger t = new BooleanTrigger();
-            t.setDeviceId(this.getDeviceId());
-            t.setOn(this.on);
-            return t;
-        }
-    }
-
-    public static class RangeTriggerDTO extends TriggerDTO {
-        @NotNull @Getter @Setter private Operator operator;
-        @NotNull @Getter @Setter private double range;
-
-        @Override
-        public Trigger toModel() {
-            RangeTrigger t = new RangeTrigger();
-            t.setDeviceId(this.getDeviceId());
-            t.setOperator(this.operator);
-            t.setRange(this.range);
-            return t;
-        }
-    }
-
-    public static class ScenePriorityDTO {
-        @NotNull @Getter @Setter private long sceneId;
-
-        @NotNull
-        @Min(0)
-        private @Getter @Setter Integer priority;
-
-        public ScenePriority toModel() {
-            ScenePriority s = new ScenePriority();
-            s.setSceneId(sceneId);
-            s.setPriority(priority);
-            return s;
-        }
-    }
-
-    public abstract static class ConditionDTO {
-        @NotNull @Getter @Setter private long deviceId;
-
-        public abstract Condition toModel();
-    }
-
-    public static class BooleanConditionDTO extends ConditionDTO {
-
-        @NotNull @Getter @Setter private boolean on;
-
-        @Override
-        public Condition toModel() {
-            BooleanCondition t = new BooleanCondition();
-            t.setDeviceId(this.getDeviceId());
-            t.setOn(this.on);
-            return t;
-        }
-    }
-
-    public static class RangeConditionDTO extends ConditionDTO {
-
-        @NotNull @Getter @Setter private Operator operator;
-        @NotNull @Getter @Setter private double range;
-
-        @Override
-        public Condition toModel() {
-            RangeCondition t = new RangeCondition();
-            t.setDeviceId(this.getDeviceId());
-            t.setOperator(this.operator);
-            t.setRange(this.range);
-            return t;
-        }
-    }
-
-    public static class ThermostatConditionDTO extends ConditionDTO {
-
-        @NotNull @Getter @Setter private ThermostatCondition.Operator operator;
-        @NotNull @Getter @Setter private Thermostat.Mode mode;
-
-        @Override
-        public Condition toModel() {
-            ThermostatCondition t = new ThermostatCondition();
-            t.setDeviceId(this.getDeviceId());
-            t.setOperator(this.operator);
-            t.setMode(this.mode);
-            return t;
-        }
-    }
-
     @NotNull private List scenes;
     @NotNull private List triggers;
     @NotNull private List conditions;
     @NotNull private long id;
-
     @NotNull @NotEmpty private String name;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
index 871b95c..3d9ad7e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
@@ -1,6 +1,8 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import lombok.Data;
 
 /** DTO for password reset request */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java
new file mode 100644
index 0000000..eb3dbdb
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java
@@ -0,0 +1,20 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public class BooleanConditionDTO extends ConditionDTO {
+
+    @NotNull @Getter @Setter private boolean on;
+
+    @Override
+    public Condition toModel() {
+        BooleanCondition t = new BooleanCondition();
+        t.setDeviceId(this.getDeviceId());
+        t.setOn(this.on);
+        return t;
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java
new file mode 100644
index 0000000..43a3950
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java
@@ -0,0 +1,19 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public class BooleanTriggerDTO extends TriggerDTO {
+    @NotNull @Getter @Setter private boolean on;
+
+    @Override
+    public Trigger toModel() {
+        BooleanTrigger t = new BooleanTrigger();
+        t.setDeviceId(this.getDeviceId());
+        t.setOn(this.on);
+        return t;
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ConditionDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ConditionDTO.java
new file mode 100644
index 0000000..6a5b6b6
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ConditionDTO.java
@@ -0,0 +1,12 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public abstract class ConditionDTO {
+    @NotNull @Getter @Setter private long deviceId;
+
+    public abstract Condition toModel();
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeConditionDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeConditionDTO.java
new file mode 100644
index 0000000..f3cb7d6
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeConditionDTO.java
@@ -0,0 +1,23 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public class RangeConditionDTO extends ConditionDTO {
+
+    @NotNull @Getter @Setter private Operator operator;
+    @NotNull @Getter @Setter private double range;
+
+    @Override
+    public Condition toModel() {
+        RangeCondition t = new RangeCondition();
+        t.setDeviceId(this.getDeviceId());
+        t.setOperator(this.operator);
+        t.setRange(this.range);
+        return t;
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeTriggerDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeTriggerDTO.java
new file mode 100644
index 0000000..0cab1f9
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/RangeTriggerDTO.java
@@ -0,0 +1,22 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public class RangeTriggerDTO extends TriggerDTO {
+    @NotNull @Getter @Setter private Operator operator;
+    @NotNull @Getter @Setter private double range;
+
+    @Override
+    public Trigger toModel() {
+        RangeTrigger t = new RangeTrigger();
+        t.setDeviceId(this.getDeviceId());
+        t.setOperator(this.operator);
+        t.setRange(this.range);
+        return t;
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java
new file mode 100644
index 0000000..4d4b251
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java
@@ -0,0 +1,22 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public class ScenePriorityDTO {
+    @NotNull @Getter @Setter private long sceneId;
+
+    @NotNull
+    @Min(0)
+    private @Getter @Setter Integer priority;
+
+    public ScenePriority toModel() {
+        ScenePriority s = new ScenePriority();
+        s.setSceneId(sceneId);
+        s.setPriority(priority);
+        return s;
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ThermostatConditionDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ThermostatConditionDTO.java
new file mode 100644
index 0000000..4ef455b
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ThermostatConditionDTO.java
@@ -0,0 +1,29 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public class ThermostatConditionDTO extends ConditionDTO {
+
+    @NotNull @Getter @Setter private ThermostatCondition.Operator operator;
+
+    @NotNull @Getter @Setter private Thermostat.Mode mode;
+
+    @Override
+    public Condition toModel() {
+
+        ThermostatCondition t = new ThermostatCondition();
+
+        t.setDeviceId(this.getDeviceId());
+
+        t.setOperator(this.operator);
+
+        t.setMode(this.mode);
+
+        return t;
+    }
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/TriggerDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/TriggerDTO.java
new file mode 100644
index 0000000..2a212b9
--- /dev/null
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/TriggerDTO.java
@@ -0,0 +1,12 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
+import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+public abstract class TriggerDTO {
+    @NotNull @Getter @Setter private long deviceId;
+
+    public abstract Trigger toModel();
+}
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
index 476fefc..7cec0be 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
@@ -2,14 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import io.swagger.annotations.ApiModelProperty;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index 0bc1213..5271a83 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -2,16 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import java.util.Date;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 import lombok.Data;
 
 @Data
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
index 89806a7..e4fa18d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
 
 /** Represent a dimmable light */
 @Entity
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java
index 4147fba..1e8cde9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OutputDevice.java
@@ -1,6 +1,8 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 /**
  * Represents a generic output device, i.e. something that causes some behaviour (light, smartPlugs,
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
index 8363853..d6f7ef5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
@@ -2,14 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import io.swagger.annotations.ApiModelProperty;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.PreRemove;
+import javax.persistence.*;
 import javax.validation.constraints.Min;
 
 @Entity
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserRepository.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserRepository.java
index bd93385..253c0ea 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserRepository.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserRepository.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import java.util.*;
+import java.util.Optional;
 import org.springframework.data.repository.CrudRepository;
 
 public interface UserRepository extends CrudRepository {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
index 8668e1a..08c0bf6 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
@@ -1,6 +1,9 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.AutomationRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.TriggerRepository;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
index edba584..7fa0adb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
@@ -3,7 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
index f8c8e5b..3312613 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
@@ -4,7 +4,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.*;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
index 009dfab..c924db4 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
@@ -12,7 +12,9 @@ import com.google.common.collect.Multimaps;
 import com.google.gson.Gson;
 import java.io.IOException;
 import java.util.*;
-import javax.websocket.*;
+import javax.websocket.Endpoint;
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
index 4f10fc6..b9bb68a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
@@ -2,7 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -10,17 +10,10 @@ import org.junit.jupiter.api.Test;
 @DisplayName("Automation Update DTO")
 public class AutomationFastUpdateRequestTest {
 
-    AutomationFastUpdateRequest.BooleanTriggerDTO booleanTriggerDTO;
-    AutomationFastUpdateRequest.RangeTriggerDTO rangeTriggerDTO;
-    AutomationFastUpdateRequest.ScenePriorityDTO scenePriorityDTO;
-    AutomationFastUpdateRequest.BooleanConditionDTO booleanConditionDTO;
-    AutomationFastUpdateRequest.RangeConditionDTO rangeConditionDTO;
-    AutomationFastUpdateRequest.ThermostatConditionDTO thermostatConditionDTO;
-
     @Test
     @DisplayName(" checking boolean trigger ")
     public void booleanTriggerDTOTest() {
-        booleanTriggerDTO = new AutomationFastUpdateRequest.BooleanTriggerDTO();
+        BooleanTriggerDTO booleanTriggerDTO = new BooleanTriggerDTO();
         booleanTriggerDTO.setOn(true);
         booleanTriggerDTO.setDeviceId(42);
         BooleanTrigger booleanTrigger = (BooleanTrigger) booleanTriggerDTO.toModel();
@@ -31,7 +24,7 @@ public class AutomationFastUpdateRequestTest {
     @Test
     @DisplayName(" checking range trigger ")
     public void rangeTriggerDTOTest() {
-        rangeTriggerDTO = new AutomationFastUpdateRequest.RangeTriggerDTO();
+        RangeTriggerDTO rangeTriggerDTO = new RangeTriggerDTO();
         rangeTriggerDTO.setOperator(Operator.EQUAL);
         rangeTriggerDTO.setDeviceId(420);
         rangeTriggerDTO.setRange(12);
@@ -45,7 +38,7 @@ public class AutomationFastUpdateRequestTest {
     @Test
     @DisplayName(" checking scene priority ")
     public void scenePriorityDTOTest() {
-        scenePriorityDTO = new AutomationFastUpdateRequest.ScenePriorityDTO();
+        ScenePriorityDTO scenePriorityDTO = new ScenePriorityDTO();
         scenePriorityDTO.setPriority(67);
         scenePriorityDTO.setSceneId(21);
 
@@ -57,7 +50,7 @@ public class AutomationFastUpdateRequestTest {
     @Test
     @DisplayName(" checking boolean condition ")
     public void booleanConditionDTOTest() {
-        booleanConditionDTO = new AutomationFastUpdateRequest.BooleanConditionDTO();
+        BooleanConditionDTO booleanConditionDTO = new BooleanConditionDTO();
         booleanConditionDTO.setOn(true);
         booleanConditionDTO.setDeviceId(17);
 
@@ -69,7 +62,7 @@ public class AutomationFastUpdateRequestTest {
     @Test
     @DisplayName(" checking range condition ")
     public void rangeConditionDTOTest() {
-        rangeConditionDTO = new AutomationFastUpdateRequest.RangeConditionDTO();
+        RangeConditionDTO rangeConditionDTO = new RangeConditionDTO();
         rangeConditionDTO.setOperator(Operator.LESS);
         rangeConditionDTO.setRange(82.01);
         rangeConditionDTO.setDeviceId(13);
@@ -83,7 +76,7 @@ public class AutomationFastUpdateRequestTest {
     @Test
     @DisplayName(" checking thermostat condition ")
     public void thermostatConditionDTOTest() {
-        thermostatConditionDTO = new AutomationFastUpdateRequest.ThermostatConditionDTO();
+        ThermostatConditionDTO thermostatConditionDTO = new ThermostatConditionDTO();
         thermostatConditionDTO.setDeviceId(25);
         thermostatConditionDTO.setOperator(ThermostatCondition.Operator.EQUAL);
         thermostatConditionDTO.setMode(Thermostat.Mode.HEATING);
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java
index dd48ae5..9d3e97e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/GsonTests.java
@@ -3,6 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.BooleanTriggerDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.TriggerDTO;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -26,16 +28,15 @@ public class GsonTests {
         assertThat(o.get("kind").getAsString()).isEqualTo("booleanTrigger");
 
         AutomationFastUpdateRequest a = new AutomationFastUpdateRequest();
-        AutomationFastUpdateRequest.BooleanTriggerDTO bt =
-                new AutomationFastUpdateRequest.BooleanTriggerDTO();
+        BooleanTriggerDTO bt = new BooleanTriggerDTO();
         bt.setDeviceId(42L);
         a.setTriggers(List.of(bt));
 
         AutomationFastUpdateRequest a2 =
                 gson.fromJson(gson.toJson(a), AutomationFastUpdateRequest.class);
-        AutomationFastUpdateRequest.TriggerDTO t = a2.getTriggers().get(0);
+        TriggerDTO t = a2.getTriggers().get(0);
 
-        assertThat(t).isExactlyInstanceOf(AutomationFastUpdateRequest.BooleanTriggerDTO.class);
+        assertThat(t).isExactlyInstanceOf(BooleanTriggerDTO.class);
         assertThat(t.getDeviceId()).isEqualTo(42L);
     }
 }

From 016c9f563e6acf28a60b550e3916e83b6aed677e Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 14:35:51 +0200
Subject: [PATCH 073/176] Added DeviceService tests possibly breaking
 everything

---
 .../sa4/sanmarinoes/smarthut/models/User.java | 138 ++++--------------
 .../service/JWTUserDetailsService.java        |   2 +-
 .../sanmarinoes/smarthut/SmartHutTest.java    |   2 +-
 .../sa4/sanmarinoes/smarthut/UserTests.java   |   8 +-
 .../smarthut/service/DeviceServiceTests.java  | 105 ++++++++++++-
 5 files changed, 141 insertions(+), 114 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
index 61bdf6d..fc575b5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
@@ -6,28 +6,40 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 
 /** A user of the Smarthut application */
 @Entity(name = "smarthutuser")
+@ToString
 public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id", updatable = false, nullable = false, unique = true)
     @ApiModelProperty(hidden = true)
+    @Getter
+    @Setter
     private Long id;
 
     /** The full name of the user */
     @Column(nullable = false)
+    @Getter
+    @Setter
     private String name;
 
     /** The full username of the user */
     @Column(nullable = false, unique = true)
+    @Getter
+    @Setter
     private String username;
 
     /** A properly salted way to store the password */
     @Column(nullable = false)
     @GsonExclude
+    @Getter
+    @Setter
     private String password;
 
     /**
@@ -35,11 +47,15 @@ public class User {
      * , technically not RFC 5322 compliant
      */
     @Column(nullable = false, unique = true)
+    @Getter
+    @Setter
     private String email;
 
     /** Guests invited by this user */
     @ManyToMany(mappedBy = "hosts", cascade = CascadeType.DETACH)
     @GsonExclude
+    @Getter
+    @ToString.Exclude
     private Set guests = new HashSet<>();
 
     @ManyToMany(cascade = CascadeType.DETACH)
@@ -48,74 +64,34 @@ public class User {
             joinColumns = @JoinColumn(name = "guest_id"),
             inverseJoinColumns = @JoinColumn(name = "host_id"))
     @GsonExclude
+    @Getter
+    @ToString.Exclude
     private Set hosts = new HashSet<>();
 
     /** Determines whether a guest can access security cameras */
     @Column(nullable = false)
+    @Getter
+    @Setter
     private boolean cameraEnabled;
 
     @Column(nullable = false)
     @GsonExclude
+    @Getter
+    @Setter
     private boolean isEnabled = false;
 
-    public Long getId() {
-        return id;
+    @Override
+    public int hashCode() {
+        if (id == null) return Integer.MAX_VALUE;
+        return (int) (id % Integer.MAX_VALUE);
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public boolean getEnabled() {
-        return isEnabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        isEnabled = enabled;
-    }
-
-    public Set getGuests() {
-        return guests;
-    }
-
-    public Set getHosts() {
-        return hosts;
-    }
-
-    public boolean isCameraEnabled() {
-        return cameraEnabled;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return Objects.equals(id, user.id);
     }
 
     public void addGuest(User guest) {
@@ -125,54 +101,4 @@ public class User {
     public void addHost(User host) {
         this.hosts.add(host);
     }
-
-    public void removeGuest(User guest) {
-        this.guests.remove(guest);
-    }
-
-    public void setCameraEnabled(boolean cameraEnabled) {
-        this.cameraEnabled = cameraEnabled;
-    }
-
-    @Override
-    public String toString() {
-        return "User{id="
-                + id
-                + ", name='"
-                + name
-                + '\''
-                + ", username='"
-                + username
-                + '\''
-                + ", password='"
-                + password
-                + '\''
-                + ", email='"
-                + email
-                + '\''
-                + ", cameraEnabled="
-                + cameraEnabled
-                + ", isEnabled="
-                + isEnabled
-                + '}';
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        User user = (User) o;
-        return cameraEnabled == user.cameraEnabled
-                && isEnabled == user.isEnabled
-                && Objects.equals(id, user.id)
-                && Objects.equals(name, user.name)
-                && Objects.equals(username, user.username)
-                && Objects.equals(password, user.password)
-                && Objects.equals(email, user.email);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, name, username, password, email, isEnabled, cameraEnabled);
-    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
index 3312613..51eb7d9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
@@ -16,7 +16,7 @@ public class JWTUserDetailsService implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String username) {
         User toReturn = repository.findByUsername(username);
-        if (toReturn != null && toReturn.getEnabled()) {
+        if (toReturn != null && toReturn.isEnabled()) {
             return new org.springframework.security.core.userdetails.User(
                     toReturn.getUsername(), toReturn.getPassword(), Set.of());
         } else {
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
index 4ac1a0f..95edf1a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
@@ -56,7 +56,7 @@ public abstract class SmartHutTest {
 
         assertThat(res3).isNotNull();
         assertThat(res3.getStatusCode()).isEqualTo(HttpStatus.FOUND);
-        assertThat(userRepository.findByUsername("enabled").getEnabled()).isTrue();
+        assertThat(userRepository.findByUsername("enabled").isEnabled()).isTrue();
     }
 
     @BeforeEach
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
index 1d16b16..2331dc3 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
@@ -20,7 +20,7 @@ public class UserTests {
     @Test
     @DisplayName("get and set id")
     public void getAndSetId() {
-        user.setId(20l);
+        user.setId(20L);
 
         assertEquals(20, user.getId());
     }
@@ -62,7 +62,7 @@ public class UserTests {
     public void getAndSetEnabled() {
         user.setEnabled(true);
 
-        assertTrue(user.getEnabled());
+        assertTrue(user.isEnabled());
     }
 
     @Test
@@ -76,8 +76,8 @@ public class UserTests {
     @Test
     @DisplayName("equals")
     public void eq() {
-        assertFalse(user.equals(null));
+        assertNotEquals(null, user);
 
-        assertTrue(user.equals(user));
+        assertEquals(user, user);
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
index 683ec65..37db737 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
@@ -1,8 +1,8 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
@@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
@@ -136,4 +137,104 @@ public class DeviceServiceTests {
 
         assertThat(deviceService.saveAsGuest(t, "user", 1L)).isEqualTo(t);
     }
+
+    @Test
+    public void testDeleteIdAsOwner() {
+        try {
+            doNothing().when(devicePropagationService).deleteByIdAsOwner(1L, "user");
+            deviceService.deleteByIdAsOwner(1L, "user");
+        } catch (NotFoundException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void populateComputedFields() {
+        doNothing().when(devicePopulationService).populateComputedFields(List.of());
+        deviceService.populateComputedFields(List.of());
+    }
+
+    @Test
+    public void testSaveAllAsOwner() {
+        final DeviceService currentDeviceService = Mockito.spy(deviceService);
+        List devices = List.of(new RegularLight(), new ButtonDimmer());
+        when(devicePropagationService.saveAllAsOwner(
+                        eq(devices), eq("user"), anyBoolean(), eq(false)))
+                .thenReturn(devices);
+
+        final int[] count = new int[1];
+
+        doAnswer(i -> count[0]++)
+                .when(currentDeviceService)
+                .triggerTriggers(any(Device.class), eq("user"));
+
+        currentDeviceService.saveAllAsOwner(devices, "user", true, false);
+        assertThat(count[0]).isEqualTo(0);
+
+        currentDeviceService.saveAllAsOwner(devices, "user", false, false);
+        assertThat(count[0]).isEqualTo(2);
+    }
+
+    @Test
+    public void testSaveAsOwner() {
+        final DeviceService currentDeviceService = Mockito.spy(deviceService);
+        Device device = new ButtonDimmer();
+
+        final boolean[] count = new boolean[1];
+
+        doAnswer(i -> count[0] = true).when(currentDeviceService).triggerTriggers(device, "user");
+        when(devicePropagationService.saveAsOwner(device, "user")).thenReturn(device);
+
+        assertThat(currentDeviceService.saveAsOwner(device, "user")).isEqualTo(device);
+        assertThat(count[0]).isTrue();
+    }
+
+    @Test
+    public void testFindAll() throws NotFoundException {
+        final DeviceService currentDeviceService = Mockito.spy(deviceService);
+        final SecurityCamera gerryScotti = new SecurityCamera();
+        doNothing().when(currentDeviceService).throwIfRoomNotOwned(1L, "user");
+        doNothing().when(devicePopulationService).populateComputedFields(any());
+
+        when(deviceRepository.findByRoomId(1L)).thenReturn(List.of(gerryScotti));
+        when(deviceRepository.findAllByUsername("user")).thenReturn(List.of(gerryScotti));
+
+        final User user = new User();
+        user.setUsername("user");
+        user.setEmail("user@example.com");
+        user.setName("User");
+        user.setId(1L);
+        user.setCameraEnabled(true);
+
+        final User guest = new User();
+        guest.setUsername("guest");
+        guest.setEmail("guest@example.com");
+        guest.setName("Guest");
+        guest.setId(2L);
+        guest.getHosts().add(user);
+        user.getGuests().add(guest);
+
+        when(userRepository.findByUsername("guest")).thenReturn(guest);
+        when(userRepository.findById(1L)).thenReturn(Optional.of(user));
+        when(userRepository.findById(3L)).thenReturn(Optional.empty());
+
+        final Room r = new Room();
+        r.setUserId(1L);
+        when(roomRepository.findById(1L)).thenReturn(Optional.of(r));
+        when(roomRepository.findById(3L)).thenReturn(Optional.empty());
+
+        assertThat(currentDeviceService.findAll(1L, null, "user")).containsExactly(gerryScotti);
+        assertThat(currentDeviceService.findAll(null, "user")).containsExactly(gerryScotti);
+
+        assertThatThrownBy(() -> currentDeviceService.findAll(1L, 3L, "guest"))
+                .isInstanceOf(NotFoundException.class);
+        assertThatThrownBy(() -> currentDeviceService.findAll(3L, 1L, "guest"))
+                .isInstanceOf(NotFoundException.class);
+
+        assertThat(currentDeviceService.findAll(1L, 1L, "guest")).containsExactly(gerryScotti);
+
+        user.setCameraEnabled(false);
+
+        assertThat(currentDeviceService.findAll(1L, 1L, "guest")).isEmpty();
+    }
 }

From 77e9b1f0c65990d77acca8c3ab45f9b81caf5b15 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 19 May 2020 15:52:03 +0200
Subject: [PATCH 074/176] fix

---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
index 7cec0be..70bad76 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class Condition {
 
     @Transient private String kind;

From 294cdc9a5df708a17d52720cf649929ad093c6a5 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 17:12:16 +0200
Subject: [PATCH 075/176] Added basic tests to AutomationController

---
 .../smarthut/dto/AutomationSaveRequest.java   |   2 +
 .../controller/AutomationControllerTests.java | 107 ++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java
index 00f0c07..9e57f06 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationSaveRequest.java
@@ -2,9 +2,11 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
+@AllArgsConstructor
 public class AutomationSaveRequest {
     private long id;
     @NotNull @NotEmpty private String name;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
new file mode 100644
index 0000000..1805aba
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
@@ -0,0 +1,107 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.security.Principal;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class AutomationControllerTests {
+    @InjectMocks private AutomationController automationController;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private AutomationRepository automationRepository;
+
+    @Mock private Principal mockPrincipal;
+
+    private final User u;
+
+    public AutomationControllerTests() {
+        u = new User();
+        u.setName("user");
+        u.setId(1L);
+    }
+
+    @Test
+    public void testGetAll() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(automationRepository.findAllByUserId(1L)).thenReturn(List.of());
+        assertThat(automationController.getAll(null, mockPrincipal)).isEmpty();
+    }
+
+    @Test
+    public void testGet() throws NotFoundException {
+        Automation a = new Automation();
+        when(automationRepository.findById(1L)).thenReturn(Optional.of(a));
+        when(automationRepository.findById(2L)).thenReturn(Optional.empty());
+
+        assertThat(automationController.get(1L)).isSameAs(a);
+        assertThatThrownBy(() -> automationController.get(2L))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    private void equalToRequest(Automation created, AutomationSaveRequest a) {
+        assertThat(created.getName()).isEqualTo(a.getName());
+        assertThat(created.getUserId()).isEqualTo(1L);
+    }
+
+    @Test
+    public void testCreate() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(automationRepository.save(any(Automation.class))).thenAnswer(i -> i.getArguments()[0]);
+
+        AutomationSaveRequest a = new AutomationSaveRequest(26, "Automation");
+        Automation created = automationController.create(a, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(0L);
+        equalToRequest(created, a);
+    }
+
+    @Test
+    public void testUpdate() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        final Automation old = new Automation();
+        old.setId(42L);
+        old.setName("Old Name");
+
+        when(automationRepository.save(any(Automation.class))).thenAnswer(i -> i.getArguments()[0]);
+        when(automationRepository.findById(42L)).thenReturn(Optional.of(old));
+        when(automationRepository.findById(43L)).thenReturn(Optional.empty());
+
+        AutomationSaveRequest a = new AutomationSaveRequest(42L, "New Name");
+
+        Automation created = automationController.update(a, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(42L);
+        equalToRequest(created, a);
+
+        a.setId(43L);
+        assertThatThrownBy(() -> automationController.update(a, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    public void testDelete() {
+        final Automation old = new Automation();
+        old.setId(42L);
+        old.setName("Old Name");
+        doNothing().when(automationRepository).deleteById(42L);
+        automationController.delete(42L);
+    }
+}

From fc6c1e7492a670969ffb674def9f552a50163528 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 17:34:12 +0200
Subject: [PATCH 076/176] Added basic tests to RoomController

---
 .../smarthut/dto/RoomSaveRequest.java         |   2 +
 .../controller/RoomControllerTests.java       | 134 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java
index a4074ab..7883aa3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RoomSaveRequest.java
@@ -3,9 +3,11 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import javax.persistence.Lob;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
+@AllArgsConstructor
 public class RoomSaveRequest {
 
     /** Room identifier */
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
new file mode 100644
index 0000000..2ae72f2
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
@@ -0,0 +1,134 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+import static org.springframework.test.util.AssertionErrors.fail;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RoomSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class RoomControllerTests {
+    @InjectMocks private RoomController roomController;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private RoomRepository roomRepository;
+
+    @Mock private Principal mockPrincipal;
+
+    @Mock private SwitchRepository switchRepository;
+
+    @Mock private KnobDimmerRepository knobDimmerRepository;
+
+    @Mock private ButtonDimmerRepository buttonDimmerRepository;
+
+    @Mock private DeviceService deviceService;
+
+    private final User u;
+
+    public RoomControllerTests() {
+        u = new User();
+        u.setName("user");
+        u.setId(1L);
+    }
+
+    @Test
+    public void testGetAll() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(roomRepository.findByUsername("user")).thenReturn(List.of());
+        assertThat(roomController.findAll(null, mockPrincipal)).isEmpty();
+    }
+
+    @Test
+    public void testGet() throws NotFoundException {
+        Room r = new Room();
+        when(roomRepository.findById(1L)).thenReturn(Optional.of(r));
+        when(roomRepository.findById(2L)).thenReturn(Optional.empty());
+
+        assertThat(roomController.findById(1L, mockPrincipal, null)).isSameAs(r);
+        assertThatThrownBy(() -> roomController.findById(2L, mockPrincipal, null))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    private void equalToRequest(Room created, RoomSaveRequest a) {
+        assertThat(created.getName()).isEqualTo(a.getName());
+        assertThat(created.getUserId()).isEqualTo(1L);
+        assertThat(created.getIcon()).isEqualTo(a.getIcon());
+        assertThat(created.getImage()).isEqualTo(a.getImage());
+    }
+
+    @Test
+    public void testCreate() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(roomRepository.save(any(Room.class))).thenAnswer(i -> i.getArguments()[0]);
+
+        RoomSaveRequest roomSaveRequest = new RoomSaveRequest(0, Icon.BEER, null, "New Room");
+        Room created = roomController.create(roomSaveRequest, mockPrincipal);
+        assertThat(created.getId()).isNull();
+        equalToRequest(created, roomSaveRequest);
+    }
+
+    @Test
+    public void testUpdate() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        final Room old = new Room();
+        old.setId(42L);
+        old.setUserId(1L);
+        old.setName("Old Name");
+
+        when(roomRepository.save(any(Room.class))).thenAnswer(i -> i.getArguments()[0]);
+        when(roomRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(old));
+        when(roomRepository.findByIdAndUsername(43L, "user")).thenReturn(Optional.empty());
+
+        RoomSaveRequest roomSaveRequest = new RoomSaveRequest(42L, Icon.BEER, null, "New Room");
+
+        Room created =
+                roomController.update(roomSaveRequest.getId(), roomSaveRequest, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(42L);
+        equalToRequest(created, roomSaveRequest);
+
+        roomSaveRequest.setId(43L);
+        assertThatThrownBy(
+                        () ->
+                                roomController.update(
+                                        roomSaveRequest.getId(), roomSaveRequest, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    public void testDelete() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+
+        final Room toDelete = new Room();
+        toDelete.setId(42L);
+
+        doNothing().when(switchRepository).deleteAllByRoomId(42L);
+        doNothing().when(knobDimmerRepository).deleteAllByRoomId(42L);
+        doNothing().when(buttonDimmerRepository).deleteAllByRoomId(42L);
+        when(roomRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(toDelete));
+        when(deviceService.findAll(42L, null, "user")).thenReturn(List.of());
+        doNothing().when(roomRepository).delete(toDelete);
+
+        try {
+            roomController.deleteById(42L, mockPrincipal);
+        } catch (NotFoundException e) {
+            fail(e.getMessage());
+        }
+    }
+}

From 76e5bed11937f7efb61347bfe1f8eec306e3e312 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 18:06:48 +0200
Subject: [PATCH 077/176] Added basic tests to SceneController

---
 .../smarthut/dto/SceneSaveRequest.java        |  4 +
 .../controller/SceneControllerTests.java      | 99 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
index 59e1b2f..1da48f9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
@@ -3,9 +3,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import javax.persistence.Column;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SceneSaveRequest {
 
     /** Room identifier */
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
new file mode 100644
index 0000000..f9ac6ee
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
@@ -0,0 +1,99 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SceneSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.security.Principal;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class SceneControllerTests {
+    @InjectMocks private SceneController sceneController;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private Principal mockPrincipal;
+
+    private final User u;
+
+    public SceneControllerTests() {
+        u = new User();
+        u.setName("user");
+        u.setId(1L);
+    }
+
+    @Test
+    public void testGetAll() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(sceneRepository.findByUsername("user")).thenReturn(List.of());
+        assertThat(sceneController.findAll(mockPrincipal, null)).isEmpty();
+    }
+
+    private void equalToRequest(Scene created, SceneSaveRequest a) {
+        assertThat(created.getName()).isEqualTo(a.getName());
+        assertThat(created.getUserId()).isEqualTo(1L);
+        assertThat(created.getIcon()).isEqualTo(a.getIcon());
+        assertThat(created.isGuestAccessEnabled()).isEqualTo(a.isGuestAccessEnabled());
+    }
+
+    @Test
+    public void testCreate() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(sceneRepository.save(any())).thenAnswer(i -> i.getArguments()[0]);
+
+        SceneSaveRequest s = new SceneSaveRequest(0, "New Scene", Icon.BATH, true);
+        Scene created = sceneController.create(s, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(0L);
+        equalToRequest(created, s);
+    }
+
+    @Test
+    public void testUpdate() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        final Scene old = new Scene();
+        old.setId(42L);
+        old.setName("Old Name");
+
+        when(sceneRepository.save(any())).thenAnswer(i -> i.getArguments()[0]);
+        when(sceneRepository.findById(42L)).thenReturn(Optional.of(old));
+        when(sceneRepository.findById(43L)).thenReturn(Optional.empty());
+
+        SceneSaveRequest a = new SceneSaveRequest(0, "New Scene", Icon.BATH, true);
+
+        Scene created = sceneController.update(a.getId(), a, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(42L);
+        equalToRequest(created, a);
+
+        a.setId(43L);
+        assertThatThrownBy(() -> sceneController.update(a.getId(), a, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    public void testDelete() {
+        final Automation old = new Automation();
+        old.setId(42L);
+        old.setName("Old Name");
+        doNothing().when(sceneRepository).deleteById(42L);
+        sceneController.deleteById(42L);
+    }
+}

From 6b3886ccb1f85c699310755e0342fcfc9bf1286c Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 18:38:31 +0200
Subject: [PATCH 078/176] Added basic tests to SmartPlugController

---
 build.gradle                                  |  2 +-
 .../controller/ButtonDimmerController.java    |  4 +-
 .../controller/KnobDimmerController.java      |  4 +-
 .../controller/MotionSensorController.java    |  4 +-
 .../controller/SmartPlugController.java       |  1 -
 .../smarthut/controller/SwitchController.java |  4 +-
 ...est.java => GenericDeviceSaveRequest.java} |  2 +-
 .../smarthut/dto/SwitchableSaveRequest.java   |  4 +
 .../smarthut/SceneSaveRequestTests.java       |  2 +-
 .../smarthut/SwitchableSaveRequestTests.java  |  8 +-
 .../controller/SceneControllerTests.java      | 15 ++-
 .../controller/SmartPlugControllerTests.java  | 93 +++++++++++++++++++
 12 files changed, 119 insertions(+), 24 deletions(-)
 rename src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/{GenericDeviceSaveReguest.java => GenericDeviceSaveRequest.java} (91%)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java

diff --git a/build.gradle b/build.gradle
index a6f73d3..a933dc9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
 gradle.projectsEvaluated {
 	tasks.withType(JavaCompile) {
-		options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+		options.compilerArgs << "-Xlint:deprecation"
 	}
 }
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
index 8e3b313..5e3966c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
@@ -1,7 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ButtonDimmerDimRequest;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveReguest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmerRepository;
@@ -41,7 +41,7 @@ public class ButtonDimmerController
 
     @PostMapping
     public ButtonDimmer create(
-            @Valid @RequestBody final GenericDeviceSaveReguest bd, final Principal principal)
+            @Valid @RequestBody final GenericDeviceSaveRequest bd, final Principal principal)
             throws NotFoundException {
         deviceService.throwIfRoomNotOwned(bd.getRoomId(), principal.getName());
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
index c91144e..266713d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveReguest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.KnobDimmerDimRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
@@ -40,7 +40,7 @@ public class KnobDimmerController extends InputDeviceConnectionController stateStateRepository;
+
     private final User u;
 
     public SceneControllerTests() {
@@ -41,7 +43,6 @@ public class SceneControllerTests {
     @Test
     public void testGetAll() throws NotFoundException {
         when(mockPrincipal.getName()).thenReturn("user");
-        when(userRepository.findByUsername("user")).thenReturn(u);
         when(sceneRepository.findByUsername("user")).thenReturn(List.of());
         assertThat(sceneController.findAll(mockPrincipal, null)).isEmpty();
     }
@@ -68,16 +69,16 @@ public class SceneControllerTests {
     @Test
     public void testUpdate() throws NotFoundException {
         when(mockPrincipal.getName()).thenReturn("user");
-        when(userRepository.findByUsername("user")).thenReturn(u);
         final Scene old = new Scene();
         old.setId(42L);
+        old.setUserId(1L);
         old.setName("Old Name");
 
         when(sceneRepository.save(any())).thenAnswer(i -> i.getArguments()[0]);
-        when(sceneRepository.findById(42L)).thenReturn(Optional.of(old));
-        when(sceneRepository.findById(43L)).thenReturn(Optional.empty());
+        when(sceneRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(old));
+        when(sceneRepository.findByIdAndUsername(43L, "user")).thenReturn(Optional.empty());
 
-        SceneSaveRequest a = new SceneSaveRequest(0, "New Scene", Icon.BATH, true);
+        SceneSaveRequest a = new SceneSaveRequest(42L, "New Scene", Icon.BATH, true);
 
         Scene created = sceneController.update(a.getId(), a, mockPrincipal);
         assertThat(created.getId()).isEqualTo(42L);
@@ -90,9 +91,7 @@ public class SceneControllerTests {
 
     @Test
     public void testDelete() {
-        final Automation old = new Automation();
-        old.setId(42L);
-        old.setName("Old Name");
+        doNothing().when(stateStateRepository).deleteAllBySceneId(42L);
         doNothing().when(sceneRepository).deleteById(42L);
         sceneController.deleteById(42L);
     }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
new file mode 100644
index 0000000..ddb4cc8
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
@@ -0,0 +1,93 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.util.AssertionErrors.fail;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class SmartPlugControllerTests {
+    @InjectMocks private SmartPlugController smartPlugController;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private SmartPlugRepository smartPlugRepository;
+
+    @Mock private Principal mockPrincipal;
+
+    @Mock private DeviceService deviceService;
+
+    private final User u;
+
+    public SmartPlugControllerTests() {
+        u = new User();
+        u.setName("user");
+        u.setId(1L);
+    }
+
+    private void equalToRequest(Switchable created, SwitchableSaveRequest a) {
+        assertThat(created.getName()).isEqualTo(a.getName());
+        assertThat(created.getRoomId()).isEqualTo(30L);
+        assertThat(created.isOn()).isEqualTo(a.isOn());
+    }
+
+    @Test
+    public void testCreate() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(deviceService.saveAsOwner(any(), eq("user"))).thenAnswer(i -> i.getArguments()[0]);
+
+        SwitchableSaveRequest a = new SwitchableSaveRequest(true, 1L, 30L, "New SmartPlug");
+        try {
+            Switchable created = smartPlugController.create(a, mockPrincipal);
+            assertThat(created.getId()).isEqualTo(0L);
+            equalToRequest(created, a);
+        } catch (NotFoundException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testUpdate() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        final SmartPlug old = new SmartPlug();
+        old.setId(42L);
+
+        when(deviceService.saveAsOwner(any(), eq("user"))).thenAnswer(i -> i.getArguments()[0]);
+        when(smartPlugRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(old));
+        when(smartPlugRepository.findByIdAndUsername(43L, "user")).thenReturn(Optional.empty());
+
+        SwitchableSaveRequest a = new SwitchableSaveRequest(true, 42L, 30L, "New SmartPlug");
+
+        SmartPlug created = smartPlugController.update(a, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(42L);
+        equalToRequest(created, a);
+
+        a.setId(43L);
+        assertThatThrownBy(() -> smartPlugController.update(a, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    public void testDelete() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        doNothing().when(deviceService).deleteByIdAsOwner(42L, "user");
+        smartPlugController.deleteById(42L, mockPrincipal);
+    }
+}

From 7f1655a0fe5109d85038bc2b966ac72d32296d08 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 19:13:51 +0200
Subject: [PATCH 079/176] Some tests on DevicePropagationService

---
 .../AutomationFastUpdateRequestTest.java      |  2 +-
 .../smarthut/ButtonDimmerTests.java           |  2 +-
 .../sa4/sanmarinoes/smarthut/DimmerTests.java |  3 +-
 .../sanmarinoes/smarthut/KnobDimmerTests.java |  2 +-
 .../smarthut/RangeTriggerTests.java           |  4 +-
 .../smarthut/RegularLightTests.java           |  3 +-
 .../sa4/sanmarinoes/smarthut/RoomTests.java   |  1 -
 .../smarthut/SecurityCameraTests.java         |  3 +-
 .../sa4/sanmarinoes/smarthut/SensorTests.java |  2 +-
 .../sanmarinoes/smarthut/SmartPlugTests.java  |  3 +-
 .../sa4/sanmarinoes/smarthut/SwitchTests.java |  3 +-
 .../smarthut/SwitchableSaveRequestTests.java  |  4 +-
 .../SwitchableStateSaveRequestTests.java      |  4 +-
 .../smarthut/SwitchableStateTests.java        |  2 +-
 .../smarthut/ThermostatSaveRequestTests.java  |  1 -
 .../sanmarinoes/smarthut/ThermostatTests.java |  4 +-
 .../sanmarinoes/smarthut/TriggerTests.java    |  2 +-
 .../sa4/sanmarinoes/smarthut/UtilsTests.java  |  2 +-
 .../controller/AutomationControllerTests.java | 12 ++-
 .../controller/RoomControllerTests.java       |  3 +-
 .../controller/SensorControllerTests.java     |  7 +-
 .../DevicePropagationServiceTests.java        | 90 +++++++++++++++++++
 22 files changed, 126 insertions(+), 33 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
index b9bb68a..aec1231 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java
index 45ad962..7f2829f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
index b3971b8..0d2b24e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java
index 8eb7f74..2a77c47 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
index 4c46d70..28e2a29 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
@@ -1,8 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java
index c4f4694..17ec2e4 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
index 781473b..e6fd907 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
@@ -6,7 +6,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
-import javax.swing.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
index a9ed512..857f64e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SecurityCamera;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
index 0326d70..4cc53c8 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor.SensorType;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
index 921979e..a586128 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SmartPlug;
 import java.math.BigDecimal;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java
index 9f937d3..7b1738d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
index ec37aec..816c588 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
@@ -1,8 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
index d3619cf..7a3be15 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
@@ -1,8 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableStateSaveRequest;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
index 737053d..d95d01c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
index dac79f2..90dbc3f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
@@ -1,7 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatSaveRequest;
 import java.math.BigDecimal;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
index ecc3d9b..abff3be 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
@@ -1,8 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import java.math.BigDecimal;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
index 3790f3a..eeced96 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
index 0ac7d71..554783b 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
@@ -1,7 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
index 1805aba..b0e3a68 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
@@ -2,16 +2,20 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.AutomationRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
index 2ae72f2..c86a1ec 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
@@ -3,7 +3,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
 import static org.springframework.test.util.AssertionErrors.fail;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RoomSaveRequest;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
index 6ef3158..56b15b5 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -2,7 +2,8 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
@@ -11,7 +12,9 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.math.BigDecimal;
 import java.security.Principal;
 import lombok.SneakyThrows;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
new file mode 100644
index 0000000..897515c
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
@@ -0,0 +1,90 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class DevicePropagationServiceTests {
+    @InjectMocks private DevicePropagationService devicePropagationService;
+
+    @Mock private SensorSocketEndpoint endpoint;
+
+    @Mock private DeviceRepository deviceRepository;
+
+    @Mock private EagerUserRepository userRepository;
+
+    @Test
+    public void testPropagateUpdateAsGuest() {
+        Device toPropagate = new SecurityCamera();
+
+        User host = new User();
+        host.setName("host");
+        host.setId(1L);
+
+        User guest = new User();
+        guest.setName("guest");
+        guest.setId(2L);
+
+        User guest2 = new User();
+        guest.setName("guest2");
+        guest.setId(3L);
+
+        guest.getHosts().add(host);
+        host.getGuests().add(guest);
+        guest2.getHosts().add(host);
+        host.getGuests().add(guest2);
+
+        doNothing().when(endpoint).queueDeviceUpdate(toPropagate, host, true, null, false);
+
+        boolean[] done = new boolean[1];
+
+        doAnswer(i -> done[0] = true)
+                .when(endpoint)
+                .queueDeviceUpdate(toPropagate, guest2, false, host.getId(), false);
+
+        devicePropagationService.propagateUpdateAsGuest(toPropagate, host, guest);
+        assertThat(done[0]).isTrue();
+    }
+
+    @Test
+    public void saveAllAsGuestSceneApplication() {
+        User host = new User();
+        host.setName("host");
+        host.setId(1L);
+
+        User guest = new User();
+        guest.setName("guest");
+        guest.setId(2L);
+
+        guest.getHosts().add(host);
+        host.getGuests().add(guest);
+
+        int[] done = new int[1];
+
+        final DevicePropagationService devicePropagationService1 =
+                Mockito.spy(devicePropagationService);
+        doAnswer(i -> done[0]++)
+                .when(devicePropagationService1)
+                .propagateUpdateAsGuest(any(), eq(host), eq(guest));
+        when(deviceRepository.saveAll(any())).thenAnswer(i -> i.getArguments()[0]);
+
+        when(userRepository.findById(1L)).thenReturn(Optional.of(host));
+        when(userRepository.findByUsername("guest")).thenReturn(guest);
+
+        devicePropagationService1.saveAllAsGuestSceneApplication(
+                List.of(new SecurityCamera(), new ButtonDimmer()), "guest", 1L);
+
+        assertThat(done[0]).isEqualTo(2);
+    }
+}

From c2ecf0d0dcb851dba9e82019ddd6f8cdbe26cb7b Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Tue, 19 May 2020 19:38:33 +0200
Subject: [PATCH 080/176] Reorganized tests

---
 .../smarthut/{ => dto}/AutomationFastUpdateRequestTest.java    | 2 +-
 .../sanmarinoes/smarthut/{ => dto}/SceneSaveRequestTests.java  | 3 +--
 .../sanmarinoes/smarthut/{ => dto}/SensorSaveRequestTests.java | 3 +--
 .../smarthut/{ => dto}/SwitchOperationRequestTests.java        | 3 +--
 .../smarthut/{ => dto}/SwitchableSaveRequestTests.java         | 3 +--
 .../smarthut/{ => dto}/SwitchableStateSaveRequestTests.java    | 3 +--
 .../{ => dto}/ThermostatConditionSaveRequestTests.java         | 3 +--
 .../smarthut/{ => dto}/ThermostatSaveRequestTests.java         | 3 +--
 .../smarthut/{ => dto}/UserRegistrationRequestTests.java       | 3 +--
 .../sa4/sanmarinoes/smarthut/{ => dto}/UserResponseTests.java  | 3 +--
 .../sa4/sanmarinoes/smarthut/{ => error}/ExceptionTests.java   | 3 +--
 .../sa4/sanmarinoes/smarthut/{ => model}/AutomationTests.java  | 2 +-
 .../smarthut/{ => model}/BooleanConditionTests.java            | 2 +-
 .../sanmarinoes/smarthut/{ => model}/BooleanTriggerTests.java  | 2 +-
 .../sanmarinoes/smarthut/{ => model}/ButtonDimmerTests.java    | 2 +-
 .../sa4/sanmarinoes/smarthut/{ => model}/ConditionTests.java   | 2 +-
 .../smarthut/{ => model}/ConfirmationTokenTests.java           | 2 +-
 .../sa4/sanmarinoes/smarthut/{ => model}/CurtainsTests.java    | 2 +-
 .../sanmarinoes/smarthut/{ => model}/DimmableLightTests.java   | 2 +-
 .../sanmarinoes/smarthut/{ => model}/DimmableStateTests.java   | 2 +-
 .../sa4/sanmarinoes/smarthut/{ => model}/DimmableTests.java    | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/DimmerTests.java  | 2 +-
 .../sa4/sanmarinoes/smarthut/{ => model}/KnobDimmerTests.java  | 2 +-
 .../sanmarinoes/smarthut/{ => model}/MotionSensorTests.java    | 2 +-
 .../sanmarinoes/smarthut/{ => model}/RangeConditionTests.java  | 2 +-
 .../sanmarinoes/smarthut/{ => model}/RangeTriggerTests.java    | 2 +-
 .../sanmarinoes/smarthut/{ => model}/RegularLightTests.java    | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/RoomTests.java    | 2 +-
 .../sanmarinoes/smarthut/{ => model}/ScenePriorityTests.java   | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/SceneTests.java   | 2 +-
 .../sanmarinoes/smarthut/{ => model}/SecurityCameraTests.java  | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/SensorTests.java  | 2 +-
 .../sa4/sanmarinoes/smarthut/{ => model}/SmartPlugTests.java   | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/StateTests.java   | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/SwitchTests.java  | 2 +-
 .../sanmarinoes/smarthut/{ => model}/SwitchableStateTests.java | 2 +-
 .../smarthut/{ => model}/ThermostatConditionTests.java         | 2 +-
 .../sa4/sanmarinoes/smarthut/{ => model}/ThermostatTests.java  | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/TriggerTests.java | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => model}/UserTests.java    | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/{ => utils}/UtilsTests.java   | 3 +--
 41 files changed, 41 insertions(+), 52 deletions(-)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/AutomationFastUpdateRequestTest.java (98%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/SceneSaveRequestTests.java (91%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/SensorSaveRequestTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/SwitchOperationRequestTests.java (91%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/SwitchableSaveRequestTests.java (92%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/SwitchableStateSaveRequestTests.java (89%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/ThermostatConditionSaveRequestTests.java (93%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/ThermostatSaveRequestTests.java (94%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/UserRegistrationRequestTests.java (91%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => dto}/UserResponseTests.java (90%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => error}/ExceptionTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/AutomationTests.java (98%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/BooleanConditionTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/BooleanTriggerTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/ButtonDimmerTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/ConditionTests.java (94%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/ConfirmationTokenTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/CurtainsTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/DimmableLightTests.java (98%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/DimmableStateTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/DimmableTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/DimmerTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/KnobDimmerTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/MotionSensorTests.java (92%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/RangeConditionTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/RangeTriggerTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/RegularLightTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/RoomTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/ScenePriorityTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/SceneTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/SecurityCameraTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/SensorTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/SmartPlugTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/StateTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/SwitchTests.java (98%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/SwitchableStateTests.java (92%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/ThermostatConditionTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/ThermostatTests.java (98%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/TriggerTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => model}/UserTests.java (97%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{ => utils}/UtilsTests.java (94%)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequestTest.java
similarity index 98%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequestTest.java
index aec1231..d796526 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationFastUpdateRequestTest.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequestTest.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequestTests.java
similarity index 91%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequestTests.java
index e9b0516..8bd6cc0 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SceneSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
index 7a219b1..6c99297 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java
similarity index 91%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java
index 1a6634a..74fafc3 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchOperationRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchOperationRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequestTests.java
similarity index 92%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequestTests.java
index 816c588..ac3b7a2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableSaveRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequestTests.java
similarity index 89%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequestTests.java
index 7a3be15..d98311b 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchableStateSaveRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableStateSaveRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java
similarity index 93%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java
index eeb108b..51b4fd2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatConditionSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequestTests.java
similarity index 94%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequestTests.java
index 90dbc3f..5592bd2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatSaveRequest;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequestTests.java
similarity index 91%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequestTests.java
index 8126088..232c8f5 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserRegistrationRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserRegistrationRequestTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponseTests.java
similarity index 90%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponseTests.java
index 621f64c..ba82712 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponseTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java
index 07ff076..adf0a52 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ExceptionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.error;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.error.*;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java
similarity index 98%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java
index 2bbd99b..7c4e7c7 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AutomationTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java
index 8e7a885..824a8fb 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanTriggerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java
index 8972d70..a1fc6e7 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/BooleanTriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
index 7f2829f..421ca0f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ButtonDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java
similarity index 94%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java
index 6c66cd5..b676b28 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConfirmationTokenTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConfirmationTokenTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java
index 363fa0c..5503552 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ConfirmationTokenTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/CurtainsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/CurtainsTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java
index 06bd3e2..c366510 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/CurtainsTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java
similarity index 98%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableLightTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java
index f54e754..a72b16e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableLightTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java
index 3c19612..9b58d94 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java
index 54d1992..a50d2cb 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmableTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
index 0d2b24e..5f1ec32 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/DimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
index 2a77c47..181dc57 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/KnobDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java
similarity index 92%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java
index 9a547e0..9c4d9ac 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/MotionSensorTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java
index 1d7772e..d963fda 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java
index 28e2a29..27a5623 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RangeTriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java
index 17ec2e4..97a66b4 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RegularLightTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java
index e6fd907..538806f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/RoomTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java
index 6d27fbf..b2309b4 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ScenePriorityTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java
index 28c6f84..a72557c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SceneTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java
index 857f64e..1fc45fc 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SecurityCameraTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java
index 4cc53c8..f9c49ad 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SensorTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java
index a586128..046a2d2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartPlugTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java
index 3c5ef86..7b1e513 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/StateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
similarity index 98%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
index 7b1738d..b05bb94 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java
similarity index 92%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java
index d95d01c..c9be074 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SwitchableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java
index d19ce69..3e3de78 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java
similarity index 98%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java
index abff3be..c708c93 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/ThermostatTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java
index eeced96..ca8dec0 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/TriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java
similarity index 97%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java
index 2331dc3..9a4c1e0 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java
similarity index 94%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java
index 554783b..c5fcc8d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UtilsTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.utils;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.when;
@@ -6,7 +6,6 @@ import static org.mockito.Mockito.when;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;

From 4b96820d36d2b07154313396f7275341bc2896e8 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 20 May 2020 10:14:17 +0200
Subject: [PATCH 081/176] Tested Automation FastUpdate

---
 .../dto/automation/BooleanConditionDTO.java   |  4 +
 .../dto/automation/BooleanTriggerDTO.java     |  4 +
 .../dto/automation/ScenePriorityDTO.java      |  4 +
 .../controller/AutomationControllerTests.java | 92 +++++++++++++++++--
 4 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java
index eb3dbdb..fd5e807 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanConditionDTO.java
@@ -3,9 +3,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Condition;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+@NoArgsConstructor
+@AllArgsConstructor
 public class BooleanConditionDTO extends ConditionDTO {
 
     @NotNull @Getter @Setter private boolean on;
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java
index 43a3950..c73de71 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/BooleanTriggerDTO.java
@@ -3,9 +3,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+@NoArgsConstructor
+@AllArgsConstructor
 public class BooleanTriggerDTO extends TriggerDTO {
     @NotNull @Getter @Setter private boolean on;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java
index 4d4b251..65761cb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/automation/ScenePriorityDTO.java
@@ -3,9 +3,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+@NoArgsConstructor
+@AllArgsConstructor
 public class ScenePriorityDTO {
     @NotNull @Getter @Setter private long sceneId;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
index b0e3a68..452ffc7 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
@@ -3,15 +3,15 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationFastUpdateRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.AutomationSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.BooleanConditionDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.BooleanTriggerDTO;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.automation.ScenePriorityDTO;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.AutomationRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
@@ -33,6 +33,12 @@ public class AutomationControllerTests {
 
     @Mock private Principal mockPrincipal;
 
+    @Mock private TriggerRepository> triggerRepository;
+
+    @Mock private ConditionRepository> conditionRepository;
+
+    @Mock private ScenePriorityRepository scenePriorityRepository;
+
     private final User u;
 
     public AutomationControllerTests() {
@@ -100,6 +106,80 @@ public class AutomationControllerTests {
                 .isInstanceOf(NotFoundException.class);
     }
 
+    @Test
+    public void testFastUpdate() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+
+        final Automation a = new Automation();
+        a.setId(42L);
+        a.setName("Old Name");
+
+        final RangeTrigger rt = new RangeTrigger();
+        final RangeCondition co = new RangeCondition();
+
+        a.getTriggers().add(rt);
+        a.getConditions().add(co);
+
+        final AutomationFastUpdateRequest f = new AutomationFastUpdateRequest();
+        f.setName("New name");
+        f.setId(43L);
+        f.setScenes(List.of(new ScenePriorityDTO(30L, 1)));
+
+        final BooleanConditionDTO b = new BooleanConditionDTO(true);
+        b.setDeviceId(1L);
+        f.setConditions(List.of(b));
+
+        final BooleanTriggerDTO c = new BooleanTriggerDTO(true);
+        c.setDeviceId(1L);
+        f.setTriggers(List.of(c));
+
+        doAnswer(
+                        i -> {
+                            a.getTriggers().clear();
+                            return null;
+                        })
+                .when(triggerRepository)
+                .deleteAllByAutomationId(42L);
+        doAnswer(
+                        i -> {
+                            a.getConditions().clear();
+                            return null;
+                        })
+                .when(conditionRepository)
+                .deleteAllByAutomationId(42L);
+        doAnswer(
+                        i -> {
+                            a.getScenes().clear();
+                            return null;
+                        })
+                .when(scenePriorityRepository)
+                .deleteAllByAutomationId(42L);
+
+        when(automationRepository.findByIdAndUserId(42L, 1L)).thenReturn(Optional.of(a));
+        when(automationRepository.findByIdAndUserId(43L, 1L)).thenReturn(Optional.empty());
+
+        when(conditionRepository.saveAll(any())).thenAnswer(i -> i.getArguments()[0]);
+        when(triggerRepository.saveAll(any())).thenAnswer(i -> i.getArguments()[0]);
+        when(scenePriorityRepository.saveAll(any())).thenAnswer(i -> i.getArguments()[0]);
+        when(automationRepository.save(any())).thenAnswer(i -> i.getArguments()[0]);
+
+        assertThatThrownBy(() -> automationController.fastUpdate(f, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+
+        f.setId(42L);
+
+        Automation saved = automationController.fastUpdate(f, mockPrincipal);
+
+        assertThat(saved.getId()).isEqualTo(42L);
+        assertThat(saved.getName()).isEqualTo("New name");
+        assertThat(saved.getTriggers()).doesNotContain(rt);
+        assertThat(saved.getConditions()).doesNotContain(co);
+        assertThat(saved.getTriggers().size()).isEqualTo(1);
+        assertThat(saved.getConditions().size()).isEqualTo(1);
+        assertThat(saved.getScenes().size()).isEqualTo(1);
+    }
+
     @Test
     public void testDelete() {
         final Automation old = new Automation();

From 03bd2207811f6cbb51aadc0f1c05681cb446ec9c Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 20 May 2020 11:10:05 +0200
Subject: [PATCH 082/176] WIP on SensorSocketEndpointTests

---
 .../smarthut/socket/SensorSocketEndpoint.java | 10 ++-
 .../socket/SensorSocketEndpointTests.java     | 69 +++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
index c924db4..2b54e62 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
@@ -28,7 +28,7 @@ public class SensorSocketEndpoint extends Endpoint {
 
     private final Gson gson = GsonConfig.socketGson();
 
-    @Autowired private DevicePopulationService deviceService;
+    private final DevicePopulationService deviceService;
 
     private final UserRepository userRepository;
 
@@ -43,9 +43,13 @@ public class SensorSocketEndpoint extends Endpoint {
     private final Map> messages = new HashMap<>();
 
     @Autowired
-    public SensorSocketEndpoint(UserRepository userRepository, JWTTokenUtils jwtTokenUtils) {
+    public SensorSocketEndpoint(
+            UserRepository userRepository,
+            JWTTokenUtils jwtTokenUtils,
+            DevicePopulationService deviceService) {
         this.jwtTokenUtils = jwtTokenUtils;
         this.userRepository = userRepository;
+        this.deviceService = deviceService;
     }
 
     /**
@@ -93,7 +97,7 @@ public class SensorSocketEndpoint extends Endpoint {
      * @param messages the message batch to send
      * @param u the user to which to send the message
      */
-    private void broadcast(User u, Collection messages) {
+    void broadcast(User u, Collection messages) {
         if (messages.isEmpty()) return;
         final HashSet sessions = new HashSet<>(authorizedClients.get(u));
         for (Session s : sessions) {
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
new file mode 100644
index 0000000..8c61124
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
@@ -0,0 +1,69 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.socket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonConfig;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DevicePopulationService;
+import com.google.gson.Gson;
+import java.util.Collection;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class SensorSocketEndpointTests {
+
+    @InjectMocks private SensorSocketEndpoint sensorSocketEndpoint;
+
+    private final Gson gson = GsonConfig.socketGson();
+
+    @Mock private DevicePopulationService deviceService;
+
+    @Test
+    public void testQueueDeviceUpdate() {
+        doNothing().when(deviceService).populateComputedFields(any());
+        Device d = new ButtonDimmer();
+
+        User u = new User();
+        u.setId(1L);
+
+        sensorSocketEndpoint.queueDeviceUpdate(d, u, true, 42L, true);
+        assertThat(d.isFromGuest()).isTrue();
+        assertThat(d.getFromHostId()).isEqualTo(42L);
+        assertThat(d.isDeleted()).isTrue();
+
+        final boolean[] done = new boolean[1];
+
+        final SensorSocketEndpoint endpoint = Mockito.spy(sensorSocketEndpoint);
+
+        doAnswer(
+                        i -> {
+                            if (done[0]) fail("Broadcast called more than once");
+                            final User us = (User) i.getArguments()[0];
+                            @SuppressWarnings("unchecked")
+                            final Collection jsons =
+                                    (Collection) i.getArguments()[1];
+                            assertThat(us).isSameAs(u);
+                            assertThat(jsons).containsExactly(gson.toJson(d));
+                            done[0] = true;
+                            return null;
+                        })
+                .when(endpoint)
+                .broadcast(eq(u), any());
+
+        endpoint.flushDeviceUpdates();
+
+        assertThat(done[0]).isTrue();
+    }
+}

From f534665bdb7775325499310b215eeb22b1daefde Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 20 May 2020 11:35:25 +0200
Subject: [PATCH 083/176] WIP on SensorSocketEndpointTests

---
 .../socket/SensorSocketEndpointTests.java     | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
index 8c61124..eeee07d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
@@ -4,16 +4,22 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.*;
+import static org.springframework.test.util.ReflectionTestUtils.getField;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonConfig;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.config.JWTTokenUtils;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Device;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DevicePopulationService;
+import com.google.common.collect.Multimap;
 import com.google.gson.Gson;
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.websocket.Session;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -30,6 +36,20 @@ public class SensorSocketEndpointTests {
 
     @Mock private DevicePopulationService deviceService;
 
+    @Mock private Session session;
+
+    @Mock private JWTTokenUtils jwtTokenUtils;
+
+    @Mock private UserRepository userRepository;
+
+    private final User u;
+
+    public SensorSocketEndpointTests() {
+        u = new User();
+        u.setName("user");
+        u.setId(1L);
+    }
+
     @Test
     public void testQueueDeviceUpdate() {
         doNothing().when(deviceService).populateComputedFields(any());
@@ -66,4 +86,28 @@ public class SensorSocketEndpointTests {
 
         assertThat(done[0]).isTrue();
     }
+
+    @Test
+    public void testCheckToken() {
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(session.getRequestParameterMap())
+                .thenReturn(Map.of("token", List.of("randomgarbage")));
+        when(jwtTokenUtils.getUsernameFromToken("randomgarbage")).thenReturn("user");
+        when(jwtTokenUtils.isTokenExpired("randomgarbage")).thenReturn(false);
+        sensorSocketEndpoint.onOpen(session, null);
+        @SuppressWarnings("unchecked")
+        Multimap map =
+                (Multimap)
+                        getField(
+                                sensorSocketEndpoint,
+                                SensorSocketEndpoint.class,
+                                "authorizedClients");
+        assertThat(map).isNotNull();
+        assertThat(map.size()).isEqualTo(1);
+        assertThat(map.entries().iterator().next().getKey()).isSameAs(u);
+        assertThat(map.entries().iterator().next().getValue()).isSameAs(session);
+    }
+
+    @Test
+    public void testBroadcast() {}
 }

From 5c90428fcad5d41f2c777c70d90fc3df85833468 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 20 May 2020 11:49:54 +0200
Subject: [PATCH 084/176] done SensorSocketEndpointTests

---
 .../socket/SensorSocketEndpointTests.java     | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
index eeee07d..9104034 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpointTests.java
@@ -16,9 +16,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DevicePopulationService;
 import com.google.common.collect.Multimap;
 import com.google.gson.Gson;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -88,7 +90,7 @@ public class SensorSocketEndpointTests {
     }
 
     @Test
-    public void testCheckToken() {
+    public void testCheckToken() throws IOException {
         when(userRepository.findByUsername("user")).thenReturn(u);
         when(session.getRequestParameterMap())
                 .thenReturn(Map.of("token", List.of("randomgarbage")));
@@ -106,8 +108,26 @@ public class SensorSocketEndpointTests {
         assertThat(map.size()).isEqualTo(1);
         assertThat(map.entries().iterator().next().getKey()).isSameAs(u);
         assertThat(map.entries().iterator().next().getValue()).isSameAs(session);
-    }
+        final Session closedSession = Mockito.mock(Session.class);
+        when(closedSession.isOpen()).thenReturn(false);
+        when(session.isOpen()).thenReturn(true);
+        map.put(u, closedSession);
 
-    @Test
-    public void testBroadcast() {}
+        boolean[] sent = new boolean[1];
+        final RemoteEndpoint.Basic b = Mockito.mock(RemoteEndpoint.Basic.class);
+        when(session.getBasicRemote()).thenReturn(b);
+
+        doAnswer(
+                        i -> {
+                            sent[0] = true;
+                            return null;
+                        })
+                .when(b)
+                .sendText("[\"Malusa\",\"Luciano\"]");
+
+        sensorSocketEndpoint.broadcast(null, List.of());
+        sensorSocketEndpoint.broadcast(u, List.of("\"Malusa\"", "\"Luciano\""));
+        assertThat(sent[0]).isTrue();
+        assertThat(map.get(u)).containsExactly(session);
+    }
 }

From ae10998c9861e9d164961a4916720f8a5a658d88 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 20 May 2020 16:39:44 +0200
Subject: [PATCH 085/176] Some tests on DevicePropagationService

---
 .../service/DevicePropagationService.java     |  2 +-
 .../DevicePropagationServiceTests.java        | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
index 7fa0adb..3f2ed0e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
@@ -138,7 +138,7 @@ public class DevicePropagationService {
      * @param username the username of the owner of that device
      * @param causedByTrigger if true, send the update to the owner as well
      */
-    private void propagateUpdateAsOwner(Device device, String username, boolean causedByTrigger) {
+    void propagateUpdateAsOwner(Device device, String username, boolean causedByTrigger) {
         final User user = userRepository.findByUsername(username);
         final Set guests = user.getGuests();
         // make sure we're broadcasting from host
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
index 897515c..e26f69e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
@@ -87,4 +87,43 @@ public class DevicePropagationServiceTests {
 
         assertThat(done[0]).isEqualTo(2);
     }
+
+    @Test
+    public void testRenameIfDuplicate() {
+        when(deviceRepository.findDuplicates("Device", "user")).thenReturn(2);
+        when(deviceRepository.findDuplicates("Device (new)", "user")).thenReturn(1);
+        when(deviceRepository.findDuplicates("New Device", "user")).thenReturn(1);
+        when(deviceRepository.findDuplicates("New Device (new)", "user")).thenReturn(0);
+
+        Device d = new RegularLight();
+        d.setName("Device");
+        d.setId(42L);
+
+        devicePropagationService.renameIfDuplicate(d, "user");
+
+        assertThat(d.getName()).isEqualTo("Device (new)");
+
+        d.setName("New Device");
+        d.setId(0L);
+
+        devicePropagationService.renameIfDuplicate(d, "user");
+
+        assertThat(d.getName()).isEqualTo("New Device (new)");
+    }
+
+    @Test
+    public void testSaveAllAsOwner() {
+        final DevicePropagationService dps = Mockito.spy(devicePropagationService);
+        final Device d = new RegularLight();
+        final List dl = List.of(d);
+        doNothing().when(dps).renameIfDuplicate(d, "user");
+        when(deviceRepository.saveAll(dl)).thenReturn(dl);
+        doNothing().when(dps).propagateUpdateAsOwner(d, "user", false);
+        doNothing().when(dps).propagateUpdateAsOwner(d, "user", true);
+
+        assertThat(dps.saveAllAsOwner(dl, "user")).containsExactly(d);
+        assertThat(dps.saveAllAsOwner(dl, "user", true, true)).containsExactly(d);
+        assertThat(dps.saveAllAsOwner(dl, "user", true, false)).containsExactly(d);
+        assertThat(dps.saveAllAsOwner(dl, "user", false, true)).containsExactly(d);
+    }
 }

From 7519212ddc9409a8abc85cd0e47604b506a378c3 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Thu, 21 May 2020 11:10:12 +0200
Subject: [PATCH 086/176] Test for ThermostatController

---
 .../controller/SensorControllerTests.java     |   5 +-
 .../controller/ThermostatControllerTests.java | 131 ++++++++++++++++++
 2 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
index 56b15b5..a166335 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -12,6 +12,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.math.BigDecimal;
 import java.security.Principal;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -66,7 +67,7 @@ public class SensorControllerTests {
         checkSensorAgainstRequest(created, toSend);
     }
 
-    @DisplayName("when deleting an existant id should succeed")
+    @DisplayName("when deleting an existing id should succeed")
     @Test
     @SneakyThrows(NotFoundException.class)
     public void testDelete() {
@@ -75,6 +76,6 @@ public class SensorControllerTests {
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
 
-        sensorController.deleteById(42L, mockPrincipal);
+        Assertions.assertDoesNotThrow(() -> sensorController.deleteById(42L, mockPrincipal));
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
new file mode 100644
index 0000000..db66ddd
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
@@ -0,0 +1,131 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.ThermostatPopulationService;
+import java.math.BigDecimal;
+import java.security.Principal;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class ThermostatControllerTests {
+
+    @InjectMocks private ThermostatController thermostatController;
+
+    @Mock private StateRepository stateRepository;
+    @Mock private SceneRepository sceneRepository;
+    @Mock private ThermostatPopulationService thermostatService;
+    @Mock private ThermostatRepository thermostatRepository;
+    @Mock private DeviceService deviceService;
+    @Mock private Principal mockPrincipal;
+
+    @BeforeEach
+    public void setup() {
+        when(mockPrincipal.getName()).thenReturn("user");
+    }
+
+    private void checkThermostatAgainstRequest(
+            final Thermostat toCheck, final ThermostatSaveRequest request) {
+        assertThat(toCheck).isNotNull();
+        assertThat(toCheck.isOn()).isEqualTo(request.isTurnOn());
+        assertThat(toCheck.getTargetTemperature()).isEqualTo(request.getTargetTemperature());
+        assertThat(toCheck.isUseExternalSensors()).isEqualTo(request.isUseExternalSensors());
+        assertThat(toCheck.getName()).isEqualTo(request.getName());
+        assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
+    }
+
+    @Test
+    @DisplayName("when creating should return the same object")
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        doNothing().when(thermostatService).populateMeasuredTemperature(any(Thermostat.class));
+        when(deviceService.saveAsOwner(any(Thermostat.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+        when(thermostatRepository.save(any(Thermostat.class))).thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final ThermostatSaveRequest toSend = new ThermostatSaveRequest();
+        toSend.setRoomId(42L);
+        toSend.setTargetTemperature(new BigDecimal(40));
+        toSend.setName("Thermostat Test");
+        toSend.setUseExternalSensors(true);
+
+        final Thermostat thermostat = thermostatController.create(toSend, mockPrincipal);
+
+        checkThermostatAgainstRequest(thermostat, toSend);
+    }
+
+    @Test
+    @DisplayName("when updating should return the same object")
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+
+        final ThermostatSaveRequest toSend = new ThermostatSaveRequest();
+        toSend.setRoomId(42L);
+        toSend.setTargetTemperature(new BigDecimal(40));
+        toSend.setName("Thermostat Test");
+        toSend.setUseExternalSensors(true);
+
+        final Thermostat toUpdate = new Thermostat();
+        toSend.setRoomId(20L);
+        toSend.setTargetTemperature(new BigDecimal(50));
+        toSend.setName("Thermostat");
+        toSend.setUseExternalSensors(false);
+
+        when(thermostatRepository.findByIdAndUsername(anyLong(), any(String.class)))
+                .thenReturn(java.util.Optional.of(toUpdate));
+        when(thermostatRepository.save(any(Thermostat.class))).thenAnswer(i -> i.getArguments()[0]);
+        doNothing().when(thermostatService).populateMeasuredTemperature(any(Thermostat.class));
+        when(deviceService.saveAsOwner(any(Thermostat.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final Thermostat thermostat = thermostatController.update(toSend, mockPrincipal);
+
+        checkThermostatAgainstRequest(thermostat, toSend);
+    }
+
+    @Test
+    @DisplayName("an existing id should succeed")
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        Assertions.assertDoesNotThrow(() -> thermostatController.deleteById(42L, mockPrincipal));
+    }
+}

From 2f52be137f7cec81030e4d08f9f65a5b38d258a8 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Thu, 21 May 2020 15:47:13 +0200
Subject: [PATCH 087/176] it took me a lot of time but i managed to make to
 KnobDimmer tests, now that I kinda understand mockito the next tests should
 take considerably less time

---
 .../InputDeviceConnectionControllerTests.java |  7 ++
 .../controller/KnobDimmerControllerTests.java | 96 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
new file mode 100644
index 0000000..cab98e9
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
@@ -0,0 +1,7 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class InputDeviceConnectionControllerTests {}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
new file mode 100644
index 0000000..d83af6a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
@@ -0,0 +1,96 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.KnobDimmerDimRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.Optional;
+import java.util.Set;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("KnobDimmer controller test")
+public class KnobDimmerControllerTests {
+    @InjectMocks private KnobDimmerController controller;
+
+    @Mock private Principal principal;
+
+    @Mock private DeviceService deviceService;
+    @Mock private KnobDimmerRepository knobDimmerRepository;
+
+    @Test
+    public void testGetId() throws NotFoundException {
+        KnobDimmer dimmer = new KnobDimmer();
+        dimmer.setId(42l);
+        when(knobDimmerRepository.findById(42L)).thenReturn(Optional.of(dimmer));
+        when(knobDimmerRepository.findById(1L)).thenReturn(Optional.empty());
+        assertThat(controller.findById(42L)).isSameAs(dimmer);
+        assertThatThrownBy(() -> controller.findById(1L)).isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(deviceService.saveAsOwner(any(KnobDimmer.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        GenericDeviceSaveRequest toSend = new GenericDeviceSaveRequest();
+        toSend.setName("dimmer");
+        toSend.setRoomId(42L);
+        KnobDimmer dimmer = controller.create(toSend, principal);
+        assertThat(dimmer.getName()).isEqualTo(toSend.getName());
+        assertThat(dimmer.getRoomId()).isEqualTo(toSend.getRoomId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        controller.delete(42L, principal);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDimTo() {
+        when(principal.getName()).thenReturn("user");
+        KnobDimmer dimmer = new KnobDimmer();
+        DimmableLight light = new DimmableLight();
+        Curtains curtains = new Curtains();
+        dimmer.addDimmable(light);
+        dimmer.addDimmable(curtains);
+        when(knobDimmerRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(dimmer));
+        KnobDimmerDimRequest toSend = new KnobDimmerDimRequest();
+        toSend.setIntensity(12);
+        toSend.setId(42L);
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Set set = controller.dimTo(toSend, principal);
+        assertThat(set.size()).isEqualTo(2);
+    }
+}

From 859a9fb53e77de6a47ec029bc646534d3793f47e Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Thu, 21 May 2020 20:53:36 +0200
Subject: [PATCH 088/176] made 3 tests

---
 .../ButtonDimmerControllerTests.java          | 116 +++++++++++++
 .../InputDeviceConnectionControllerTests.java |   7 -
 .../controller/KnobDimmerControllerTests.java |   5 +-
 .../controller/SwitchControllerTests.java     | 157 ++++++++++++++++++
 4 files changed, 276 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
 delete mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
new file mode 100644
index 0000000..d3fb238
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
@@ -0,0 +1,116 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ButtonDimmerDimRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.Optional;
+import java.util.Set;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("KnobDimmer controller test")
+public class ButtonDimmerControllerTests {
+    @InjectMocks private ButtonDimmerController controller;
+
+    @Mock private DeviceService service;
+
+    @Mock private ButtonDimmerRepository repository;
+
+    @Mock Principal principal;
+
+    @Test
+    public void testGetId() throws NotFoundException {
+        ButtonDimmer dimmer = new ButtonDimmer();
+        dimmer.setId(42L);
+        when(repository.findById(42L)).thenReturn(Optional.of(dimmer));
+        when(repository.findById(1L)).thenReturn(Optional.empty());
+        assertThat(controller.findById(42L)).isSameAs(dimmer);
+        assertThatThrownBy(() -> controller.findById(1L)).isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(service).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(service.saveAsOwner(any(ButtonDimmer.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        GenericDeviceSaveRequest toSend = new GenericDeviceSaveRequest();
+        toSend.setName("dimmer");
+        toSend.setRoomId(42L);
+        ButtonDimmer dimmer = controller.create(toSend, principal);
+        assertThat(dimmer.getName()).isEqualTo(toSend.getName());
+        assertThat(dimmer.getRoomId()).isEqualTo(toSend.getRoomId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(service).deleteByIdAsOwner(eq(42L), eq("user"));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        controller.delete(42L, principal);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDimUp() {
+        when(principal.getName()).thenReturn("user");
+        ButtonDimmer button = new ButtonDimmer();
+        Curtains curtains = new Curtains();
+        DimmableLight light = new DimmableLight();
+        button.addDimmable(curtains);
+        button.addDimmable(light);
+        ButtonDimmerDimRequest toSend = new ButtonDimmerDimRequest();
+        toSend.setId(42L);
+        toSend.setDimType(ButtonDimmerDimRequest.DimType.UP);
+        when(repository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(button));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Set set = controller.dim(toSend, principal);
+        assertThat(set.size()).isEqualTo(button.getOutputs().size());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDimDown() {
+        when(principal.getName()).thenReturn("user");
+        ButtonDimmer button = new ButtonDimmer();
+        Curtains curtains = new Curtains();
+        DimmableLight light = new DimmableLight();
+        button.addDimmable(curtains);
+        button.addDimmable(light);
+        ButtonDimmerDimRequest toSend = new ButtonDimmerDimRequest();
+        toSend.setId(42L);
+        toSend.setDimType(ButtonDimmerDimRequest.DimType.DOWN);
+        when(repository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(button));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Set set = controller.dim(toSend, principal);
+        assertThat(set.size()).isEqualTo(button.getOutputs().size());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
deleted file mode 100644
index cab98e9..0000000
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-public class InputDeviceConnectionControllerTests {}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
index d83af6a..3e17d48 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
@@ -35,12 +35,13 @@ public class KnobDimmerControllerTests {
     @Mock private Principal principal;
 
     @Mock private DeviceService deviceService;
+
     @Mock private KnobDimmerRepository knobDimmerRepository;
 
     @Test
     public void testGetId() throws NotFoundException {
         KnobDimmer dimmer = new KnobDimmer();
-        dimmer.setId(42l);
+        dimmer.setId(42L);
         when(knobDimmerRepository.findById(42L)).thenReturn(Optional.of(dimmer));
         when(knobDimmerRepository.findById(1L)).thenReturn(Optional.empty());
         assertThat(controller.findById(42L)).isSameAs(dimmer);
@@ -91,6 +92,6 @@ public class KnobDimmerControllerTests {
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
         Set set = controller.dimTo(toSend, principal);
-        assertThat(set.size()).isEqualTo(2);
+        assertThat(set.size()).isEqualTo(dimmer.getOutputs().size());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
new file mode 100644
index 0000000..ea8378a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
@@ -0,0 +1,157 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchOperationRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switch;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switchable;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("KnobDimmer controller test")
+public class SwitchControllerTests {
+    @InjectMocks private SwitchController controller;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private SwitchRepository repository;
+
+    @Mock private Principal principal;
+
+    @Test
+    public void testGetId() throws NotFoundException {
+        Switch aSwitch = new Switch();
+        aSwitch.setId(42L);
+        when(repository.findById(42L)).thenReturn(Optional.of(aSwitch));
+        when(repository.findById(1L)).thenReturn(Optional.empty());
+        assertThat(controller.findById(42L)).isSameAs(aSwitch);
+        assertThatThrownBy(() -> controller.findById(1L)).isInstanceOf(NotFoundException.class);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(deviceService.saveAsOwner(any(Switch.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        GenericDeviceSaveRequest toSend = new GenericDeviceSaveRequest();
+        toSend.setName("dimmer");
+        toSend.setRoomId(42L);
+        Switch aSwitch = controller.create(toSend, principal);
+        assertThat(aSwitch.getName()).isEqualTo(toSend.getName());
+        assertThat(aSwitch.getRoomId()).isEqualTo(toSend.getRoomId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        controller.deleteById(42L, principal);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testOperate() {
+        when(principal.getName()).thenReturn("user");
+        Switch aSwitch = new Switch();
+        aSwitch.setOn(true);
+        RegularLight light = new RegularLight();
+        RegularLight light2 = new RegularLight();
+        aSwitch.connect(light, true);
+        aSwitch.connect(light2, true);
+        SwitchOperationRequest toSend = new SwitchOperationRequest();
+        toSend.setType(SwitchOperationRequest.OperationType.ON);
+        toSend.setId(42L);
+        when(repository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(aSwitch));
+        ArrayList helper = new ArrayList();
+        helper.add(light);
+        helper.add(light2);
+        when(deviceService.saveAllAsOwner(aSwitch.getOutputs(), principal.getName()))
+                .thenReturn(helper);
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        List list = controller.operate(toSend, principal);
+        assertThat(list.size()).isEqualTo(2);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testOperateOFF() {
+        when(principal.getName()).thenReturn("user");
+        Switch aSwitch = new Switch();
+        aSwitch.setOn(true);
+        RegularLight light = new RegularLight();
+        RegularLight light2 = new RegularLight();
+        aSwitch.connect(light, true);
+        aSwitch.connect(light2, true);
+        SwitchOperationRequest toSend = new SwitchOperationRequest();
+        toSend.setType(SwitchOperationRequest.OperationType.OFF);
+        toSend.setId(42L);
+        when(repository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(aSwitch));
+        ArrayList helper = new ArrayList();
+        helper.add(light);
+        helper.add(light2);
+        when(deviceService.saveAllAsOwner(aSwitch.getOutputs(), principal.getName()))
+                .thenReturn(helper);
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        List list = controller.operate(toSend, principal);
+        assertThat(list.size()).isEqualTo(2);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testOperateToggle() {
+        when(principal.getName()).thenReturn("user");
+        Switch aSwitch = new Switch();
+        aSwitch.setOn(true);
+        RegularLight light = new RegularLight();
+        RegularLight light2 = new RegularLight();
+        aSwitch.connect(light, true);
+        aSwitch.connect(light2, true);
+        SwitchOperationRequest toSend = new SwitchOperationRequest();
+        toSend.setType(SwitchOperationRequest.OperationType.TOGGLE);
+        toSend.setId(42L);
+        when(repository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(aSwitch));
+        ArrayList helper = new ArrayList();
+        helper.add(light);
+        helper.add(light2);
+        when(deviceService.saveAllAsOwner(aSwitch.getOutputs(), principal.getName()))
+                .thenReturn(helper);
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        List list = controller.operate(toSend, principal);
+        assertThat(list.size()).isEqualTo(2);
+    }
+}

From 58a8b939fa2e5a2b134452940bb398a83933bb61 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Thu, 21 May 2020 21:46:29 +0200
Subject: [PATCH 089/176] Finished tests on DevicePropagationService

---
 .../dto/SwitchOperationRequestTests.java      |   4 +-
 .../ThermostatConditionSaveRequestTests.java  |  10 +-
 .../DevicePropagationServiceTests.java        | 120 ++++++++++++++++--
 3 files changed, 114 insertions(+), 20 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java
index 74fafc3..dac05c8 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SwitchOperationRequestTests.java
@@ -18,8 +18,8 @@ public class SwitchOperationRequestTests {
     @Test
     @DisplayName("test setId")
     public void testSetId() {
-        request.setId(42l);
-        assertEquals(42l, request.getId());
+        request.setId(42L);
+        assertEquals(42L, request.getId());
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java
index 51b4fd2..9283e6f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatConditionSaveRequestTests.java
@@ -21,15 +21,15 @@ public class ThermostatConditionSaveRequestTests {
     @Test
     @DisplayName("test setDeviceId")
     public void testSetDeviceId() {
-        this.saveRequest.setDeviceId(42l);
-        assertEquals(42l, saveRequest.getDeviceId());
+        this.saveRequest.setDeviceId(42L);
+        assertEquals(42L, saveRequest.getDeviceId());
     }
 
     @Test
     @DisplayName("test setAutomationId")
     public void testSetAutomationId() {
-        this.saveRequest.setAutomationId(42l);
-        assertEquals(42l, saveRequest.getAutomationId());
+        this.saveRequest.setAutomationId(42L);
+        assertEquals(42L, saveRequest.getAutomationId());
     }
 
     @Test
@@ -56,6 +56,6 @@ public class ThermostatConditionSaveRequestTests {
     @Test
     @DisplayName("test getId")
     public void testGetId() {
-        assertEquals(0l, saveRequest.getId());
+        assertEquals(0L, saveRequest.getId());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
index e26f69e..47de5e1 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
@@ -1,12 +1,15 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.*;
 
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.util.List;
 import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -24,6 +27,24 @@ public class DevicePropagationServiceTests {
 
     @Mock private EagerUserRepository userRepository;
 
+    private User host;
+    private User guest;
+
+    private void initHostGuest() {
+        host = new User();
+        host.setName("host");
+        host.setUsername("host");
+        host.setId(1L);
+
+        guest = new User();
+        guest.setName("guest");
+        guest.setUsername("guest");
+        guest.setId(2L);
+
+        guest.getHosts().add(host);
+        host.getGuests().add(guest);
+    }
+
     @Test
     public void testPropagateUpdateAsGuest() {
         Device toPropagate = new SecurityCamera();
@@ -59,16 +80,9 @@ public class DevicePropagationServiceTests {
 
     @Test
     public void saveAllAsGuestSceneApplication() {
-        User host = new User();
-        host.setName("host");
-        host.setId(1L);
-
-        User guest = new User();
-        guest.setName("guest");
-        guest.setId(2L);
-
-        guest.getHosts().add(host);
-        host.getGuests().add(guest);
+        initHostGuest();
+        when(userRepository.findById(1L)).thenReturn(Optional.of(host));
+        when(userRepository.findByUsername("guest")).thenReturn(guest);
 
         int[] done = new int[1];
 
@@ -79,9 +93,6 @@ public class DevicePropagationServiceTests {
                 .propagateUpdateAsGuest(any(), eq(host), eq(guest));
         when(deviceRepository.saveAll(any())).thenAnswer(i -> i.getArguments()[0]);
 
-        when(userRepository.findById(1L)).thenReturn(Optional.of(host));
-        when(userRepository.findByUsername("guest")).thenReturn(guest);
-
         devicePropagationService1.saveAllAsGuestSceneApplication(
                 List.of(new SecurityCamera(), new ButtonDimmer()), "guest", 1L);
 
@@ -126,4 +137,87 @@ public class DevicePropagationServiceTests {
         assertThat(dps.saveAllAsOwner(dl, "user", true, false)).containsExactly(d);
         assertThat(dps.saveAllAsOwner(dl, "user", false, true)).containsExactly(d);
     }
+
+    @Test
+    public void testSaveAllAsGuest() {
+        final DevicePropagationService dps = Mockito.spy(devicePropagationService);
+
+        initHostGuest();
+        when(userRepository.findById(1L)).thenReturn(Optional.of(host));
+        when(userRepository.findByUsername("guest")).thenReturn(guest);
+        when(userRepository.findById(42L)).thenReturn(Optional.empty());
+
+        final User phonyGuest = new User();
+        phonyGuest.setName("phonyguest");
+
+        when(userRepository.findByUsername("phonyguest")).thenReturn(phonyGuest);
+
+        final Device d = new ButtonDimmer();
+
+        doNothing().when(dps).renameIfDuplicate(d, "host");
+
+        assertThatThrownBy(() -> dps.saveAsGuest(d, "phonyguest", 1L))
+                .isInstanceOf(NotFoundException.class);
+        assertThatThrownBy(() -> dps.saveAsGuest(d, "guest", 42L))
+                .isInstanceOf(NotFoundException.class);
+
+        when(deviceRepository.save(d)).thenReturn(d);
+        doNothing().when(dps).propagateUpdateAsGuest(d, host, guest);
+
+        Assertions.assertDoesNotThrow(() -> dps.saveAsGuest(d, "guest", 1L));
+    }
+
+    @Test
+    public void testSaveAsOwner() {
+        final DevicePropagationService dps = Mockito.spy(devicePropagationService);
+        final Device d = new ButtonDimmer();
+        doNothing().when(dps).renameIfDuplicate(d, "user");
+        doNothing().when(dps).propagateUpdateAsOwner(d, "user", false);
+        when(deviceRepository.save(d)).thenReturn(d);
+        assertThat(dps.saveAsOwner(d, "user")).isSameAs(d);
+    }
+
+    @Test
+    public void testDeleteByIdAsOwner() {
+        initHostGuest();
+
+        final Device d = new ButtonDimmer();
+
+        boolean[] done = new boolean[1];
+        when(userRepository.findByUsername("host")).thenReturn(host);
+        when(deviceRepository.findByIdAndUsername(42L, "host")).thenReturn(Optional.of(d));
+        when(deviceRepository.findByIdAndUsername(43L, "host")).thenReturn(Optional.empty());
+        doAnswer(i -> done[0] = true).when(deviceRepository).delete(d);
+        doNothing().when(endpoint).queueDeviceUpdate(d, guest, false, host.getId(), true);
+
+        assertThatThrownBy(() -> devicePropagationService.deleteByIdAsOwner(43L, "host"))
+                .isInstanceOf(NotFoundException.class);
+        Assertions.assertDoesNotThrow(
+                () -> devicePropagationService.deleteByIdAsOwner(42L, "host"));
+
+        assertThat(done[0]).isTrue();
+    }
+
+    @Test
+    public void testPropagateUpdateAsOwner() {
+        initHostGuest();
+        when(userRepository.findByUsername("host")).thenReturn(host);
+
+        final Device d = new ButtonDimmer();
+
+        int[] counter = new int[1];
+
+        doAnswer(i -> counter[0]++)
+                .when(endpoint)
+                .queueDeviceUpdate(d, guest, false, host.getId(), false);
+        doAnswer(i -> counter[0]++)
+                .when(endpoint)
+                .queueDeviceUpdate(d, host, false, host.getId(), false);
+
+        devicePropagationService.propagateUpdateAsOwner(d, "host", false);
+        assertThat(counter[0]).isEqualTo(1);
+        counter[0] = 0;
+        devicePropagationService.propagateUpdateAsOwner(d, "host", true);
+        assertThat(counter[0]).isEqualTo(2);
+    }
 }

From 1a289f6800ddf039e0777045c21a9ae393d8fbe7 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Thu, 21 May 2020 22:03:38 +0200
Subject: [PATCH 090/176] Fixed some code smells

---
 .../smarthut/models/BooleanCondition.java        |  2 ++
 .../smarthut/models/ConfirmationToken.java       |  8 ++++++++
 .../sanmarinoes/smarthut/models/Dimmable.java    |  3 +++
 .../sa4/sanmarinoes/smarthut/models/Dimmer.java  |  3 +++
 .../sanmarinoes/smarthut/models/KnobDimmer.java  |  2 ++
 .../smarthut/models/MotionSensor.java            |  2 ++
 .../smarthut/models/RangeCondition.java          |  2 ++
 .../smarthut/models/RegularLight.java            |  2 ++
 .../smarthut/models/SecurityCamera.java          |  2 ++
 .../sa4/sanmarinoes/smarthut/models/Sensor.java  |  2 ++
 .../sanmarinoes/smarthut/models/SmartPlug.java   |  2 ++
 .../sa4/sanmarinoes/smarthut/models/Switch.java  |  2 ++
 .../sanmarinoes/smarthut/models/Switchable.java  |  2 ++
 .../sanmarinoes/smarthut/models/Thermostat.java  |  2 ++
 .../smarthut/models/ThermostatCondition.java     |  2 ++
 .../smarthut/service/DeviceService.java          |  2 +-
 .../controller/AutomationControllerTests.java    |  3 ++-
 .../controller/SceneControllerTests.java         |  3 ++-
 .../controller/SmartPlugControllerTests.java     |  3 ++-
 .../smarthut/error/ExceptionTests.java           | 16 ++++++++--------
 .../smarthut/service/DeviceServiceTests.java     |  3 ++-
 21 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
index 4097c26..30d47ae 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanCondition.java
@@ -2,10 +2,12 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class BooleanCondition extends Condition {
 
     @Getter
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index 5271a83..5f61bc9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -17,6 +17,14 @@ public class ConfirmationToken {
     @Column(name = "confirmation_token", unique = true)
     private String confirmToken;
 
+    public Date getCreatedDate() {
+        return new Date(createdDate.getTime());
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = new Date(createdDate.getTime());
+    }
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date createdDate;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
index dd4c6c8..95f8e0d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
@@ -7,10 +7,12 @@ import java.util.Set;
 import javax.persistence.*;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 public class Dimmable extends Switchable implements RangeTriggerable {
 
@@ -70,6 +72,7 @@ public class Dimmable extends Switchable implements RangeTriggerable {
         setIntensity(state.getIntensity());
     }
 
+    @Override
     public State cloneState() {
         final DimmableState newState = new DimmableState();
         newState.setDeviceId(getId());
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
index 109e13e..205ddfd 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
@@ -5,9 +5,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 
 /** Represents a generic dimmer input device */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class Dimmer extends InputDevice implements Connectable {
     protected Dimmer(String kind) {
@@ -17,6 +19,7 @@ public abstract class Dimmer extends InputDevice implements Connectable {
 
     public RangeCondition() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
index feac0fb..1ef8412 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
@@ -2,11 +2,13 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
 /** Represents a standard non-dimmable light */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class RegularLight extends Switchable implements BooleanTriggerable {
 
     /** Whether the light is on or not */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
index ccb1224..b0afc82 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
@@ -2,8 +2,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.EqualsAndHashCode;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class SecurityCamera extends Switchable implements BooleanTriggerable {
 
     public SecurityCamera() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
index 58aa7f9..f4d444a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
@@ -7,9 +7,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import lombok.EqualsAndHashCode;
 
 /** A sensor input device that measures a quantity in a continuous scale (e.g. temperature) */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Sensor extends InputDevice implements RangeTriggerable {
 
     public static final Map TYPICAL_VALUES =
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
index b69e3e7..11d964b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
@@ -3,9 +3,11 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import java.math.BigDecimal;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.EqualsAndHashCode;
 
 /** A smart plug that can be turned either on or off */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class SmartPlug extends Switchable implements BooleanTriggerable {
 
     /** The average consumption of an active plug when on in Watt */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
index 359ecad..d67bfad 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
@@ -5,9 +5,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 
 /** A switch input device */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Switch extends InputDevice implements BooleanTriggerable, Connectable {
 
     @ManyToMany(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index f2d2c44..b327cf8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -5,9 +5,11 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 
 /** A device that can be turned either on or off */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
 public abstract class Switchable extends OutputDevice {
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
index a2a71a1..229f7f6 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
@@ -5,9 +5,11 @@ import java.math.BigDecimal;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
+import lombok.EqualsAndHashCode;
 
 /** A thermostat capable of controlling cooling and heating. */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Thermostat extends Switchable implements BooleanTriggerable {
 
     @Override
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java
index 2bb65d1..c621c9b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatCondition.java
@@ -3,8 +3,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import com.google.gson.annotations.SerializedName;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import lombok.EqualsAndHashCode;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class ThermostatCondition extends Condition {
 
     public ThermostatCondition() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
index c28ad1f..07adb5a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
@@ -66,7 +66,7 @@ public class DeviceService {
                         a -> {
                             final List> conditions =
                                     conditionRepository.findAllByAutomationId(a.getId());
-                            if (conditions.size() == 0) return true;
+                            if (conditions.isEmpty()) return true;
                             return conditions.stream().allMatch(Condition::triggered);
                         })
                 .map(Automation::getScenes)
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
index 452ffc7..39d8193 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationControllerTests.java
@@ -15,6 +15,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -186,6 +187,6 @@ public class AutomationControllerTests {
         old.setId(42L);
         old.setName("Old Name");
         doNothing().when(automationRepository).deleteById(42L);
-        automationController.delete(42L);
+        Assertions.assertDoesNotThrow(() -> automationController.delete(42L));
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
index a1deaa0..33f7331 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
@@ -12,6 +12,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -93,6 +94,6 @@ public class SceneControllerTests {
     public void testDelete() {
         doNothing().when(stateStateRepository).deleteAllBySceneId(42L);
         doNothing().when(sceneRepository).deleteById(42L);
-        sceneController.deleteById(42L);
+        Assertions.assertDoesNotThrow(() -> sceneController.deleteById(42L));
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
index ddb4cc8..3907f3d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
@@ -14,6 +14,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -88,6 +89,6 @@ public class SmartPlugControllerTests {
     public void testDelete() throws NotFoundException {
         when(mockPrincipal.getName()).thenReturn("user");
         doNothing().when(deviceService).deleteByIdAsOwner(42L, "user");
-        smartPlugController.deleteById(42L, mockPrincipal);
+        Assertions.assertDoesNotThrow(() -> smartPlugController.deleteById(42L, mockPrincipal));
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java
index adf0a52..bf26000 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/ExceptionTests.java
@@ -12,7 +12,7 @@ public class ExceptionTests {
         try {
             throw new BadDataException("message");
         } catch (BadDataException e) {
-            assertEquals(e.getMessage(), "message");
+            assertEquals("message", e.getMessage());
         }
     }
 
@@ -21,7 +21,7 @@ public class ExceptionTests {
         try {
             throw new DuplicateRegistrationException();
         } catch (DuplicateRegistrationException e) {
-            assertEquals(e.getMessage(), "Email or username already belonging to another user");
+            assertEquals("Email or username already belonging to another user", e.getMessage());
         }
     }
 
@@ -31,8 +31,8 @@ public class ExceptionTests {
             throw new DuplicateStateException();
         } catch (DuplicateStateException e) {
             assertEquals(
-                    e.getMessage(),
-                    "Cannot create state since it has already been created for this scene and this device");
+                    "Cannot create state since it has already been created for this scene and this device",
+                    e.getMessage());
         }
     }
 
@@ -41,7 +41,7 @@ public class ExceptionTests {
         try {
             throw new EmailTokenNotFoundException();
         } catch (EmailTokenNotFoundException e) {
-            assertEquals(e.getMessage(), "Email verification token not found in DB");
+            assertEquals("Email verification token not found in DB", e.getMessage());
         }
     }
 
@@ -50,13 +50,13 @@ public class ExceptionTests {
         try {
             throw new NotFoundException();
         } catch (NotFoundException e) {
-            assertEquals(e.getMessage(), "Not found");
+            assertEquals("Not found", e.getMessage());
         }
 
         try {
             throw new NotFoundException("message");
         } catch (NotFoundException e) {
-            assertEquals(e.getMessage(), "message not found");
+            assertEquals("message not found", e.getMessage());
         }
     }
 
@@ -65,7 +65,7 @@ public class ExceptionTests {
         try {
             throw new UserNotFoundException();
         } catch (UserNotFoundException e) {
-            assertEquals(e.getMessage(), "No user found with given email");
+            assertEquals("No user found with given email", e.getMessage());
         }
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
index 37db737..cc61142 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
@@ -8,6 +8,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.util.List;
 import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -151,7 +152,7 @@ public class DeviceServiceTests {
     @Test
     public void populateComputedFields() {
         doNothing().when(devicePopulationService).populateComputedFields(List.of());
-        deviceService.populateComputedFields(List.of());
+        Assertions.assertDoesNotThrow(() -> deviceService.populateComputedFields(List.of()));
     }
 
     @Test

From 37af69c7a7db90a2af0682bfabd075dcf7e79cd4 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Thu, 21 May 2020 23:32:48 +0200
Subject: [PATCH 091/176] Started tests on UserAccountController

---
 .../controller/UserAccountController.java     |  6 +--
 .../sanmarinoes/smarthut/models/Switch.java   |  1 +
 .../smarthut/models/Switchable.java           |  2 +-
 .../UserAccountControllerTests.java           | 45 +++++++++++++++++++
 4 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
index b1648ed..f458f62 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
@@ -101,11 +101,7 @@ public class UserAccountController {
             toSave.setEmail(registrationData.getEmail());
             userRepository.save(toSave);
 
-            ConfirmationToken token;
-            do {
-                token = new ConfirmationToken(toSave);
-            } while (confirmationTokenRepository.findByConfirmToken(token.getConfirmToken())
-                    != null);
+            ConfirmationToken token = new ConfirmationToken(toSave);
 
             confirmationTokenRepository.save(token);
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
index d67bfad..ebc0113 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
@@ -21,6 +21,7 @@ public class Switch extends InputDevice implements BooleanTriggerable, Connectab
             })
     @GsonExclude
     @SocketGsonExclude
+    @EqualsAndHashCode.Exclude
     @JoinTable(
             name = "switch_switchable",
             joinColumns = @JoinColumn(name = "switch_id"),
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index b327cf8..d976758 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode;
 
 /** A device that can be turned either on or off */
 @Entity
-@EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
 public abstract class Switchable extends OutputDevice {
 
@@ -23,6 +22,7 @@ public abstract class Switchable extends OutputDevice {
             })
     @GsonExclude
     @SocketGsonExclude
+    @EqualsAndHashCode.Exclude
     private Set inputs = new HashSet<>();
 
     protected Switchable(String kind) {
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java
new file mode 100644
index 0000000..eeb11c7
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java
@@ -0,0 +1,45 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateRegistrationException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class UserAccountControllerTests {
+
+    @InjectMocks private UserAccountController userAccountController;
+
+    @Mock private UserRepository userRepository;
+
+    @Test
+    public void testRegisterUser() {
+        final UserRegistrationRequest registrationRequest = new UserRegistrationRequest();
+        registrationRequest.setEmail("info@theshell.ch");
+        registrationRequest.setUsername("username");
+
+        when(userRepository.findByEmailIgnoreCase("info@theshell.ch")).thenReturn(null);
+        when(userRepository.findByEmailIgnoreCase("info@vimtok.com")).thenReturn(new User());
+        when(userRepository.findByUsername("username")).thenReturn(new User());
+        when(userRepository.findByUsername("simoneriva")).thenReturn(null);
+
+        Assertions.assertThatThrownBy(() -> userAccountController.registerUser(registrationRequest))
+                .isInstanceOf(DuplicateRegistrationException.class);
+
+        registrationRequest.setUsername("simoneriva");
+        registrationRequest.setEmail("info@vimtok.com");
+
+        Assertions.assertThatThrownBy(() -> userAccountController.registerUser(registrationRequest))
+                .isInstanceOf(DuplicateRegistrationException.class);
+    }
+}

From 420fed7f88ea1ba8a6aa9a7520f3133b45a95832 Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Fri, 22 May 2020 13:18:30 +0200
Subject: [PATCH 092/176] findall and findhosts should be tested in
 guestcontroller

---
 .../controller/GuestControllerTests.java      | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
new file mode 100644
index 0000000..e24721a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -0,0 +1,81 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import java.security.Principal;
+import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class GuestControllerTests {
+    @InjectMocks private GuestController guestController;
+
+    @Mock private Principal mockPrincipal;
+    @Mock private EagerUserRepository userRepository;
+
+    private final User user;
+
+    public GuestControllerTests() {
+        user = new User();
+        user.setName("user");
+        user.setId(12L);
+    }
+
+    @BeforeEach
+    public void setup() {
+        guestController = new GuestController();
+    }
+
+    @DisplayName("Check that the list is empty when we have no hosts/guests")
+    @Test
+    public void findAllEmptyTest() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user"));
+        List l = guestController.findAll();
+        assertThat(l.isEmpty());
+    }
+
+    @DisplayName("Check that the list contains the elements added")
+    @Test
+    public void findAllTest() {
+        User host = new User();
+        User guest = new User();
+
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
+        Mockito.doReturn(List.of(host, guest)).when(userRepository.findByUsername("user"));
+        assertThat(guestController.findAll()).isSameAs(List.of(host, guest));
+    }
+
+    @DisplayName("Check that we get empty host list")
+    @Test
+    public void findHostsEmptyTest() {
+        when(mockPrincipal.getName()).thenReturn("user2");
+        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user2"));
+        assertThat(guestController.findHosts(mockPrincipal).isEmpty());
+    }
+
+    @DisplayName("Check that the host list contains the hosts")
+    @Test
+    public void findHostsTest() {
+        User host1 = new User();
+        User host2 = new User();
+
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
+        Mockito.doReturn(List.of(host1, host2)).when(userRepository.findByUsername("user"));
+        assertThat(guestController.findHosts(mockPrincipal)).isSameAs(List.of(host1, host2));
+    }
+}

From 67b2c3ae4f1fde8ea7c097f8fa46c8ac1d0c681f Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Fri, 22 May 2020 13:23:14 +0200
Subject: [PATCH 093/176] findguests should be tested and imports should be
 fixed

---
 .../controller/GuestControllerTests.java      | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index e24721a..9bc0753 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -16,6 +16,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
 
 @ExtendWith(MockitoExtension.class)
 @WithMockUser(username = "user")
@@ -59,11 +60,11 @@ public class GuestControllerTests {
         assertThat(guestController.findAll()).isSameAs(List.of(host, guest));
     }
 
-    @DisplayName("Check that we get empty host list")
+    @DisplayName("Check that the host list is empty")
     @Test
     public void findHostsEmptyTest() {
-        when(mockPrincipal.getName()).thenReturn("user2");
-        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user2"));
+        when(mockPrincipal.getName()).thenReturn("user");
+        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user"));
         assertThat(guestController.findHosts(mockPrincipal).isEmpty());
     }
 
@@ -78,4 +79,24 @@ public class GuestControllerTests {
         Mockito.doReturn(List.of(host1, host2)).when(userRepository.findByUsername("user"));
         assertThat(guestController.findHosts(mockPrincipal)).isSameAs(List.of(host1, host2));
     }
+
+    @DisplayName("Check that the guest list is empty")
+    @Test
+    public void findGuestsEmptyTest() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user"));
+        assertThat(guestController.findGuests(mockPrincipal).isEmpty());
+    }
+
+    @DisplayName("Check that the guest list contains the guests")
+    @Test
+    public void findGuestsTest() {
+        User guest1 = new User();
+        User guest2 = new User();
+
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
+        Mockito.doReturn(List.of(guest1, guest2)).when(userRepository.findByUsername("user"));
+        assertThat(guestController.findGuests(mockPrincipal)).isSameAs(List.of(guest1, guest2));
+    }
 }

From 64007d1b5ce8d41db4ded5828e4979797cb35026 Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Fri, 22 May 2020 14:29:17 +0200
Subject: [PATCH 094/176] tests done so far should be fixed

---
 .../controller/GuestControllerTests.java      | 60 +++++++++----------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index 9bc0753..f172f9a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -14,7 +14,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.test.context.support.WithMockUser;
 
@@ -43,60 +42,55 @@ public class GuestControllerTests {
     @Test
     public void findAllEmptyTest() {
         when(mockPrincipal.getName()).thenReturn("user");
-        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user"));
+        when(userRepository.findByUsername("user")).thenReturn(user);
         List l = guestController.findAll();
         assertThat(l.isEmpty());
     }
 
-    @DisplayName("Check that the list contains the elements added")
+    @DisplayName(
+            "Check that the list contains the elements added and that hosts and guests are returned properly")
     @Test
     public void findAllTest() {
-        User host = new User();
-        User guest = new User();
+        User host1 = new User();
+        User host2 = new User();
+        User guest1 = new User();
+        User guest2 = new User();
 
         when(mockPrincipal.getName()).thenReturn("user");
         when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
-        Mockito.doReturn(List.of(host, guest)).when(userRepository.findByUsername("user"));
-        assertThat(guestController.findAll()).isSameAs(List.of(host, guest));
+        when(userRepository.findAll()).thenReturn(List.of(host1, host2, guest1, guest2));
+        assertThat(guestController.findAll())
+                .isSameAs(
+                        List.of(
+                                UserResponse.fromUser(host1),
+                                UserResponse.fromUser(host2),
+                                UserResponse.fromUser(guest1),
+                                UserResponse.fromUser(guest2)));
+
+        when(guestController.findHosts(mockPrincipal))
+                .thenReturn(List.of(UserResponse.fromUser(host1), UserResponse.fromUser(host2)));
+        assertThat(guestController.findHosts(mockPrincipal))
+                .isSameAs(List.of(UserResponse.fromUser(host1), UserResponse.fromUser(host2)));
+
+        when(guestController.findGuests(mockPrincipal))
+                .thenReturn(List.of(UserResponse.fromUser(guest1), UserResponse.fromUser(guest2)));
+        assertThat(guestController.findGuests(mockPrincipal))
+                .isSameAs(List.of(UserResponse.fromUser(guest1), UserResponse.fromUser(guest2)));
     }
 
     @DisplayName("Check that the host list is empty")
     @Test
     public void findHostsEmptyTest() {
         when(mockPrincipal.getName()).thenReturn("user");
-        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user"));
+        when(userRepository.findByUsername("user")).thenReturn(user);
         assertThat(guestController.findHosts(mockPrincipal).isEmpty());
     }
 
-    @DisplayName("Check that the host list contains the hosts")
-    @Test
-    public void findHostsTest() {
-        User host1 = new User();
-        User host2 = new User();
-
-        when(mockPrincipal.getName()).thenReturn("user");
-        when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
-        Mockito.doReturn(List.of(host1, host2)).when(userRepository.findByUsername("user"));
-        assertThat(guestController.findHosts(mockPrincipal)).isSameAs(List.of(host1, host2));
-    }
-
     @DisplayName("Check that the guest list is empty")
     @Test
     public void findGuestsEmptyTest() {
         when(mockPrincipal.getName()).thenReturn("user");
-        Mockito.doReturn(List.of()).when(userRepository.findByUsername("user"));
+        when(userRepository.findByUsername("user")).thenReturn(user);
         assertThat(guestController.findGuests(mockPrincipal).isEmpty());
     }
-
-    @DisplayName("Check that the guest list contains the guests")
-    @Test
-    public void findGuestsTest() {
-        User guest1 = new User();
-        User guest2 = new User();
-
-        when(mockPrincipal.getName()).thenReturn("user");
-        when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
-        Mockito.doReturn(List.of(guest1, guest2)).when(userRepository.findByUsername("user"));
-        assertThat(guestController.findGuests(mockPrincipal)).isSameAs(List.of(guest1, guest2));
-    }
 }

From b1343bbd401058deb8b52f62e6562613eb29beac Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Fri, 22 May 2020 14:35:36 +0200
Subject: [PATCH 095/176] trying to fix nullpointerexception

---
 .../smarthut/controller/GuestControllerTests.java           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index f172f9a..8619374 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -8,7 +8,6 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import java.security.Principal;
 import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -33,11 +32,6 @@ public class GuestControllerTests {
         user.setId(12L);
     }
 
-    @BeforeEach
-    public void setup() {
-        guestController = new GuestController();
-    }
-
     @DisplayName("Check that the list is empty when we have no hosts/guests")
     @Test
     public void findAllEmptyTest() {

From 5c2ee4c55f0be96ccd6445a791232bb2934ed95a Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Fri, 22 May 2020 14:44:59 +0200
Subject: [PATCH 096/176] assertion error should be fixed

---
 .../smarthut/controller/GuestControllerTests.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index 8619374..c116667 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -50,16 +50,15 @@ public class GuestControllerTests {
         User guest1 = new User();
         User guest2 = new User();
 
+        user.addHost(host1);
+        user.addHost(host2);
+        user.addGuest(guest1);
+        user.addGuest(guest2);
+
         when(mockPrincipal.getName()).thenReturn("user");
         when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
         when(userRepository.findAll()).thenReturn(List.of(host1, host2, guest1, guest2));
-        assertThat(guestController.findAll())
-                .isSameAs(
-                        List.of(
-                                UserResponse.fromUser(host1),
-                                UserResponse.fromUser(host2),
-                                UserResponse.fromUser(guest1),
-                                UserResponse.fromUser(guest2)));
+        assertThat(guestController.findAll()).isSameAs(List.of(host1, host2, guest1, guest2));
 
         when(guestController.findHosts(mockPrincipal))
                 .thenReturn(List.of(UserResponse.fromUser(host1), UserResponse.fromUser(host2)));

From 84767b1793d47810ddc5f4d8be1bc78ea4bb39a9 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 14:53:10 +0200
Subject: [PATCH 097/176] Tests on UserAccountController

---
 .../controller/ButtonDimmerController.java    |   4 +-
 .../controller/UserAccountController.java     |   7 +-
 .../dto/InitPasswordResetRequest.java         |   4 +
 .../smarthut/dto/PasswordResetRequest.java    |   4 +
 .../UserAccountControllerTests.java           | 120 +++++++++++++++++-
 5 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
index 5e3966c..330c31a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
@@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.*;
 public class ButtonDimmerController
         extends InputDeviceConnectionController {
 
-    private DeviceService deviceService;
-    private ButtonDimmerRepository buttonDimmerRepository;
+    private final DeviceService deviceService;
+    private final ButtonDimmerRepository buttonDimmerRepository;
 
     @Autowired
     protected ButtonDimmerController(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
index f458f62..a0fe8d1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
@@ -126,11 +126,8 @@ public class UserAccountController {
             throw new UserNotFoundException();
         }
 
-        ConfirmationToken token;
-        do {
-            token = new ConfirmationToken(toReset);
-            token.setResetPassword(true);
-        } while (confirmationTokenRepository.findByConfirmToken(token.getConfirmToken()) != null);
+        ConfirmationToken token = new ConfirmationToken(toReset);
+        token.setResetPassword(true);
 
         // Delete existing email password reset tokens
         confirmationTokenRepository.deleteByUserAndResetPassword(toReset, true);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java
index dca0d79..4148e18 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/InitPasswordResetRequest.java
@@ -3,10 +3,14 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /** DTO for password reset request */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class InitPasswordResetRequest {
     /**
      * The user's email (validated according to criteria used in >input type="email"<>
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
index 3d9ad7e..e533c49 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/PasswordResetRequest.java
@@ -3,10 +3,14 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /** DTO for password reset request */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class PasswordResetRequest {
 
     @NotNull private String confirmationToken;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java
index eeb11c7..3269550 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountControllerTests.java
@@ -1,17 +1,33 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
 
+import ch.usi.inf.sa4.sanmarinoes.smarthut.config.EmailConfigurationService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.InitPasswordResetRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.PasswordResetRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserRegistrationRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateRegistrationException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.EmailTokenNotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UserNotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationToken;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationTokenRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.EmailSenderService;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.test.context.support.WithMockUser;
 
 @ExtendWith(MockitoExtension.class)
@@ -22,6 +38,14 @@ public class UserAccountControllerTests {
 
     @Mock private UserRepository userRepository;
 
+    @Mock private EmailSenderService emailSenderService;
+
+    @Mock private EmailConfigurationService emailConfigurationService;
+
+    @Mock private ConfirmationTokenRepository confirmationTokenRepository;
+
+    @Mock private BCryptPasswordEncoder passwordEncoder;
+
     @Test
     public void testRegisterUser() {
         final UserRegistrationRequest registrationRequest = new UserRegistrationRequest();
@@ -42,4 +66,98 @@ public class UserAccountControllerTests {
         Assertions.assertThatThrownBy(() -> userAccountController.registerUser(registrationRequest))
                 .isInstanceOf(DuplicateRegistrationException.class);
     }
+
+    @Test
+    public void testResetPassword() throws EmailTokenNotFoundException {
+        final User u = new User();
+        final ConfirmationToken c = new ConfirmationToken(u);
+        c.setResetPassword(false);
+
+        when(userRepository.save(u)).thenReturn(u);
+
+        when(confirmationTokenRepository.findByConfirmToken("token")).thenReturn(c);
+        when(confirmationTokenRepository.findByConfirmToken("token2")).thenReturn(null);
+        doNothing().when(confirmationTokenRepository).delete(c);
+        when(passwordEncoder.encode("password")).thenReturn("encoded");
+
+        assertThatThrownBy(
+                        () ->
+                                userAccountController.resetPassword(
+                                        new PasswordResetRequest("token2", "password")))
+                .isInstanceOf(EmailTokenNotFoundException.class);
+
+        assertThatThrownBy(
+                        () ->
+                                userAccountController.resetPassword(
+                                        new PasswordResetRequest("token", "password")))
+                .isInstanceOf(EmailTokenNotFoundException.class);
+
+        c.setResetPassword(true);
+
+        userAccountController.resetPassword(new PasswordResetRequest("token", "password"));
+
+        assertThat(u.getPassword()).isEqualTo("encoded");
+    }
+
+    @Test
+    public void testInitResetPassword() throws UserNotFoundException {
+        when(emailConfigurationService.getResetPasswordSubject()).thenReturn("password reset");
+        when(emailConfigurationService.getResetPassword()).thenReturn("reset-password");
+        when(emailConfigurationService.getResetPasswordPath()).thenReturn("path");
+
+        final User u = new User();
+        u.setEmail("info@theshell.com");
+
+        boolean[] done = new boolean[1];
+
+        doAnswer(
+                        i -> {
+                            final SimpleMailMessage m = i.getArgument(0);
+                            assertThat(m.getSubject()).isEqualTo("password reset");
+                            assertThat(m.getText()).startsWith("reset-password path");
+                            done[0] = true;
+                            return null;
+                        })
+                .when(emailSenderService)
+                .sendEmail(any());
+
+        doNothing().when(confirmationTokenRepository).deleteByUserAndResetPassword(u, true);
+        when(confirmationTokenRepository.save(any())).thenAnswer(i -> i.getArgument(0));
+
+        when(userRepository.findByEmailIgnoreCase("info@theshell.ch")).thenReturn(u);
+        when(userRepository.findByEmailIgnoreCase("info@vimtok.com")).thenReturn(null);
+
+        assertThatThrownBy(
+                        () ->
+                                userAccountController.initResetPassword(
+                                        new InitPasswordResetRequest("info@vimtok.com")))
+                .isInstanceOf(UserNotFoundException.class);
+        userAccountController.initResetPassword(new InitPasswordResetRequest("info@theshell.ch"));
+
+        assertThat(done[0]).isTrue();
+    }
+
+    @Test
+    public void testConfirmUserAccount() throws EmailTokenNotFoundException, IOException {
+        final User u = new User();
+        final ConfirmationToken c = new ConfirmationToken(u);
+        c.setResetPassword(true);
+
+        when(confirmationTokenRepository.findByConfirmToken("token")).thenReturn(null);
+        when(confirmationTokenRepository.findByConfirmToken(c.getConfirmToken())).thenReturn(c);
+        when(userRepository.save(u)).thenReturn(u);
+        final HttpServletResponse r = new MockHttpServletResponse();
+
+        assertThatThrownBy(() -> userAccountController.confirmUserAccount("token", r))
+                .isInstanceOf(EmailTokenNotFoundException.class);
+        assertThatThrownBy(() -> userAccountController.confirmUserAccount(c.getConfirmToken(), r))
+                .isInstanceOf(EmailTokenNotFoundException.class);
+
+        c.setResetPassword(false);
+
+        when(emailConfigurationService.getRegistrationRedirect()).thenReturn("malusa.html");
+
+        userAccountController.confirmUserAccount(c.getConfirmToken(), r);
+        assertThat(u.isEnabled()).isTrue();
+    }
 }

From 733b4639fa334f14e347273c589bc80414cfd306 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 15:18:48 +0200
Subject: [PATCH 098/176] Tests on ThermostatService

---
 .../smarthut/service/ThermostatService.java   | 20 ++++--
 .../service/ThermostatServiceTests.java       | 66 +++++++++++++++++++
 2 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
index 5eeec6c..9065826 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
@@ -14,13 +14,25 @@ import org.springframework.stereotype.Component;
 @Component
 public class ThermostatService {
 
-    @Autowired private SensorSocketEndpoint endpoint;
+    private final SensorSocketEndpoint endpoint;
 
-    @Autowired private DeviceService deviceService;
+    private final DeviceService deviceService;
 
-    @Autowired private ThermostatPopulationService thermostatPopulationService;
+    private final ThermostatPopulationService thermostatPopulationService;
 
-    @Autowired private ThermostatRepository thermostatRepository;
+    private final ThermostatRepository thermostatRepository;
+
+    @Autowired
+    public ThermostatService(
+            SensorSocketEndpoint endpoint,
+            DeviceService deviceService,
+            ThermostatPopulationService thermostatPopulationService,
+            ThermostatRepository thermostatRepository) {
+        this.endpoint = endpoint;
+        this.deviceService = deviceService;
+        this.thermostatPopulationService = thermostatPopulationService;
+        this.thermostatRepository = thermostatRepository;
+    }
 
     private void randomJitter(Thermostat thermostat) {
         updateValueForThermostat(
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java
new file mode 100644
index 0000000..05a0447
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java
@@ -0,0 +1,66 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
+import java.math.BigDecimal;
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ThermostatServiceTests {
+
+    @InjectMocks private ThermostatService thermostatService;
+
+    @Mock private ThermostatRepository thermostatRepository;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private ThermostatPopulationService thermostatPopulationService;
+
+    @Mock private SensorSocketEndpoint endpoint;
+
+    @Test
+    public void testFakeUpdateAll() {
+        when(deviceService.saveAsOwner(any(), any())).thenAnswer(i -> i.getArgument(0));
+        when(thermostatRepository.findUser(1L)).thenReturn(new User());
+
+        Thermostat t = new Thermostat();
+        t.setOn(true);
+        t.setId(1L);
+        t.setTargetTemperature(BigDecimal.valueOf(17.0));
+
+        when(thermostatRepository.findAll()).thenReturn(List.of(t));
+        doAnswer(
+                        i -> {
+                            ((Thermostat) i.getArgument(0))
+                                    .setMeasuredTemperature(BigDecimal.valueOf(18.0));
+                            return null;
+                        })
+                .when(thermostatPopulationService)
+                .populateMeasuredTemperature(t);
+
+        doNothing().when(endpoint).queueDeviceUpdate(any(), any(), eq(false), eq(null), eq(false));
+
+        Assertions.assertDoesNotThrow(() -> thermostatService.fakeUpdateAll());
+        assertThat(t.getMode()).isNotEqualTo(Thermostat.Mode.OFF);
+    }
+
+    @Test
+    public void testFindAll() {
+        final Thermostat t = new Thermostat();
+        doNothing().when(thermostatPopulationService).populateMeasuredTemperature(t);
+        when(thermostatRepository.findAllByUsername("user")).thenReturn(List.of(t));
+        assertThat(thermostatService.findAll("user")).containsExactly(t);
+    }
+}

From a8c76c03e0cafabd2f2317c1ea4af9da5eccb767 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 15:58:09 +0200
Subject: [PATCH 099/176] Tests on SceneController

---
 .../controller/SceneControllerTests.java      | 78 ++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
index 33f7331..0134642 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SceneControllerTests.java
@@ -9,6 +9,7 @@ import static org.mockito.Mockito.when;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SceneSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.SceneService;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
@@ -33,12 +34,72 @@ public class SceneControllerTests {
 
     @Mock private StateRepository stateStateRepository;
 
+    @Mock private SceneService sceneService;
+
     private final User u;
 
+    private final User h;
+
     public SceneControllerTests() {
         u = new User();
         u.setName("user");
         u.setId(1L);
+
+        h = new User();
+        h.setId(2L);
+        h.setUsername("host");
+
+        u.getHosts().add(h);
+        h.getGuests().add(u);
+    }
+
+    @Test
+    public void testCopy() throws NotFoundException {
+        final Scene scene = new Scene();
+        final Scene copyFrom = new Scene();
+
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(sceneRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(scene));
+        when(sceneRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
+
+        when(sceneRepository.findByIdAndUsername(10L, "user")).thenReturn(Optional.of(copyFrom));
+        when(sceneRepository.findByIdAndUsername(20L, "user")).thenReturn(Optional.empty());
+
+        assertThatThrownBy(() -> sceneController.copy(2L, 10L, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+        assertThatThrownBy(() -> sceneController.copy(1L, 20L, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+
+        when(sceneService.copyStates(scene, copyFrom)).thenReturn(List.of());
+
+        assertThat(sceneController.copy(1L, 10L, mockPrincipal)).isEmpty();
+    }
+
+    @Test
+    public void testApply() throws NotFoundException {
+        final Scene s = new Scene();
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(sceneRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(s));
+        when(sceneRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
+        when(sceneService.apply(s, "user", false)).thenReturn(List.of());
+
+        assertThatThrownBy(() -> sceneController.apply(2L, mockPrincipal, null))
+                .isInstanceOf(NotFoundException.class);
+        assertThat(sceneController.apply(1L, mockPrincipal, null)).isEmpty();
+
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(userRepository.findById(2L)).thenReturn(Optional.of(h));
+
+        when(sceneRepository.findByIdAndUserIdAndGuestAccessEnabled(1L, 2L, true))
+                .thenReturn(Optional.of(s));
+        when(sceneRepository.findByIdAndUserIdAndGuestAccessEnabled(2L, 2L, true))
+                .thenReturn(Optional.empty());
+
+        when(sceneService.applyAsGuest(s, "user", 2L)).thenReturn(List.of());
+
+        assertThatThrownBy(() -> sceneController.apply(2L, mockPrincipal, 2L))
+                .isInstanceOf(NotFoundException.class);
+        assertThat(sceneController.apply(1L, mockPrincipal, 2L)).isEmpty();
     }
 
     @Test
@@ -46,10 +107,14 @@ public class SceneControllerTests {
         when(mockPrincipal.getName()).thenReturn("user");
         when(sceneRepository.findByUsername("user")).thenReturn(List.of());
         assertThat(sceneController.findAll(mockPrincipal, null)).isEmpty();
+
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        when(userRepository.findById(2L)).thenReturn(Optional.of(h));
+        assertThat(sceneController.findAll(mockPrincipal, 2L)).isEmpty();
     }
 
     private void equalToRequest(Scene created, SceneSaveRequest a) {
-        assertThat(created.getName()).isEqualTo(a.getName());
+        if (a.getName() != null) assertThat(created.getName()).isEqualTo(a.getName());
         assertThat(created.getUserId()).isEqualTo(1L);
         assertThat(created.getIcon()).isEqualTo(a.getIcon());
         assertThat(created.isGuestAccessEnabled()).isEqualTo(a.isGuestAccessEnabled());
@@ -85,6 +150,11 @@ public class SceneControllerTests {
         assertThat(created.getId()).isEqualTo(42L);
         equalToRequest(created, a);
 
+        a.setName(null);
+        created = sceneController.update(a.getId(), a, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(42L);
+        equalToRequest(created, a);
+
         a.setId(43L);
         assertThatThrownBy(() -> sceneController.update(a.getId(), a, mockPrincipal))
                 .isInstanceOf(NotFoundException.class);
@@ -96,4 +166,10 @@ public class SceneControllerTests {
         doNothing().when(sceneRepository).deleteById(42L);
         Assertions.assertDoesNotThrow(() -> sceneController.deleteById(42L));
     }
+
+    @Test
+    public void testGetStates() {
+        when(stateStateRepository.findBySceneId(1L)).thenReturn(List.of());
+        assertThat(sceneController.getStates(1L)).isEmpty();
+    }
 }

From 6abedac3ccbe9e6b3e532be73f996f5d63de958d Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 17:50:39 +0200
Subject: [PATCH 100/176] It wasn't, but now it is

---
 .../controller/GuestControllerTests.java      | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index c116667..26af2b6 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -8,6 +8,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import java.security.Principal;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,8 +36,6 @@ public class GuestControllerTests {
     @DisplayName("Check that the list is empty when we have no hosts/guests")
     @Test
     public void findAllEmptyTest() {
-        when(mockPrincipal.getName()).thenReturn("user");
-        when(userRepository.findByUsername("user")).thenReturn(user);
         List l = guestController.findAll();
         assertThat(l.isEmpty());
     }
@@ -46,9 +45,13 @@ public class GuestControllerTests {
     @Test
     public void findAllTest() {
         User host1 = new User();
+        host1.setId(2L);
         User host2 = new User();
+        host2.setId(3L);
         User guest1 = new User();
+        guest1.setId(4L);
         User guest2 = new User();
+        guest2.setId(5L);
 
         user.addHost(host1);
         user.addHost(host2);
@@ -58,17 +61,17 @@ public class GuestControllerTests {
         when(mockPrincipal.getName()).thenReturn("user");
         when(userRepository.findByUsername(mockPrincipal.getName())).thenReturn(this.user);
         when(userRepository.findAll()).thenReturn(List.of(host1, host2, guest1, guest2));
-        assertThat(guestController.findAll()).isSameAs(List.of(host1, host2, guest1, guest2));
+        assertThat(guestController.findAll())
+                .containsAll(
+                        List.of(host1, host2, guest1, guest2)
+                                .stream()
+                                .map(UserResponse::fromUser)
+                                .collect(Collectors.toList()));
 
-        when(guestController.findHosts(mockPrincipal))
-                .thenReturn(List.of(UserResponse.fromUser(host1), UserResponse.fromUser(host2)));
         assertThat(guestController.findHosts(mockPrincipal))
-                .isSameAs(List.of(UserResponse.fromUser(host1), UserResponse.fromUser(host2)));
-
-        when(guestController.findGuests(mockPrincipal))
-                .thenReturn(List.of(UserResponse.fromUser(guest1), UserResponse.fromUser(guest2)));
+                .containsExactly(UserResponse.fromUser(host1), UserResponse.fromUser(host2));
         assertThat(guestController.findGuests(mockPrincipal))
-                .isSameAs(List.of(UserResponse.fromUser(guest1), UserResponse.fromUser(guest2)));
+                .containsExactly(UserResponse.fromUser(guest1), UserResponse.fromUser(guest2));
     }
 
     @DisplayName("Check that the host list is empty")

From cae11d44ad273117c59e5d4b386de7692f2d9175 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sat, 23 May 2020 18:20:34 +0200
Subject: [PATCH 101/176] test for security camera

---
 .../ButtonDimmerControllerTests.java          |   2 +-
 .../SecurityCameraControllerTests.java        | 136 ++++++++++++++++++
 .../controller/SwitchControllerTests.java     |   2 +-
 3 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
index d3fb238..39f5b16 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
@@ -28,7 +28,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 @ExtendWith(MockitoExtension.class)
 @WithMockUser(username = "user")
-@DisplayName("KnobDimmer controller test")
+@DisplayName("ButtonDimmer controller test")
 public class ButtonDimmerControllerTests {
     @InjectMocks private ButtonDimmerController controller;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java
new file mode 100644
index 0000000..5e2d429
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java
@@ -0,0 +1,136 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.config.CameraConfigurationService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("SecurityCamera controller test")
+public class SecurityCameraControllerTests {
+
+    @InjectMocks private SecurityCameraController controller;
+
+    @Mock Principal principal;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private SecurityCameraRepository securityCameraService;
+
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private StateRepository stateRepository;
+
+    @Mock private CameraConfigurationService cameraConfigurationService;
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        when(principal.getName()).thenReturn("user");
+        SecurityCamera camera = new SecurityCamera();
+        camera.setOn(true);
+        camera.setName("name");
+        camera.setRoomId(42L);
+        when(deviceService.saveAsOwner(any(SecurityCamera.class), eq("user"))).thenReturn(camera);
+        SwitchableSaveRequest toSend = new SwitchableSaveRequest();
+        toSend.setOn(true);
+        toSend.setRoomId(42L);
+        toSend.setName("name");
+        when(cameraConfigurationService.getVideoUrl()).thenReturn("url");
+        doNothing().when(deviceService).throwIfRoomNotOwned(42L, "user");
+        SecurityCamera returned = controller.create(toSend, principal);
+        assertThat(returned.getRoomId()).isEqualTo(toSend.getRoomId());
+        assertThat(returned.getName()).isEqualTo(toSend.getName());
+        assertTrue(returned.isOn());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        when(principal.getName()).thenReturn("user");
+        SecurityCamera camera = new SecurityCamera();
+        camera.setOn(true);
+        camera.setName("name");
+        camera.setRoomId(42L);
+        SwitchableSaveRequest toSend = new SwitchableSaveRequest();
+        toSend.setId(1L);
+        toSend.setOn(true);
+        toSend.setRoomId(42L);
+        toSend.setName("name");
+        when(securityCameraService.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(camera));
+        when(deviceService.saveAsOwner(any(SecurityCamera.class), eq("user"))).thenReturn(camera);
+        when(cameraConfigurationService.getVideoUrl()).thenReturn("url");
+        SecurityCamera returned = controller.update(toSend, principal);
+        assertThat(returned.getRoomId()).isEqualTo(toSend.getRoomId());
+        assertThat(returned.getName()).isEqualTo(toSend.getName());
+        assertTrue(returned.isOn());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        controller.delete(42L, principal);
+    }
+
+    @Test
+    @SneakyThrows({NotFoundException.class, DuplicateStateException.class})
+    public void testSceneBinding() {
+        when(principal.getName()).thenReturn("user");
+        SecurityCamera camera = new SecurityCamera();
+        when(securityCameraService.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(camera));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = camera.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
+        // when(stateRepository.save(eq(state))).thenReturn(state);
+        controller.sceneBinding(24L, 1L, principal);
+    }
+
+    @Test
+    public void testSceneBinding2() {
+        when(principal.getName()).thenReturn("user");
+        SecurityCamera camera = new SecurityCamera();
+        when(securityCameraService.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(camera));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = camera.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(2);
+        assertThatThrownBy(() -> controller.sceneBinding(24L, 1L, principal))
+                .isInstanceOf(DuplicateStateException.class);
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
index ea8378a..f0c985f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
@@ -32,7 +32,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 @ExtendWith(MockitoExtension.class)
 @WithMockUser(username = "user")
-@DisplayName("KnobDimmer controller test")
+@DisplayName("SwitchController controller test")
 public class SwitchControllerTests {
     @InjectMocks private SwitchController controller;
 

From 2f9bdd4a5915b25d16c88f54a16340ca85d3eb14 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 18:36:35 +0200
Subject: [PATCH 102/176] Tests on AuthenticationController

---
 .../sanmarinoes/smarthut/dto/JWTRequest.java  |   4 +
 .../AuthenticationControllerTests.java        | 100 ++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java
index 48bb386..ef2dcb4 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/JWTRequest.java
@@ -1,9 +1,13 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class JWTRequest {
     @NotNull private String usernameOrEmail;
     @NotNull private String password;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationControllerTests.java
new file mode 100644
index 0000000..667f7f3
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationControllerTests.java
@@ -0,0 +1,100 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.config.JWTTokenUtils;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.JWTRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UnauthorizedException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.UserNotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.JWTUserDetailsService;
+import java.security.Principal;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class AuthenticationControllerTests {
+
+    @InjectMocks private AuthenticationController authenticationController;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private Principal principal;
+
+    @Mock private AuthenticationManager authenticationManager;
+
+    @Mock private JWTUserDetailsService jwtUserDetailsService;
+
+    @Mock private JWTTokenUtils jwtTokenUtils;
+
+    @Test
+    public void testProfile() {
+        final User u = new User();
+        when(principal.getName()).thenReturn("user");
+        when(userRepository.findByUsername("user")).thenReturn(u);
+        assertThat(authenticationController.profile(principal)).isSameAs(u);
+    }
+
+    @Test
+    public void testLogin() throws UnauthorizedException, UserNotFoundException {
+        final UsernamePasswordAuthenticationToken u =
+                new UsernamePasswordAuthenticationToken("username", "password");
+        final UsernamePasswordAuthenticationToken v =
+                new UsernamePasswordAuthenticationToken("disabled", "password");
+        final UsernamePasswordAuthenticationToken z =
+                new UsernamePasswordAuthenticationToken("username", "wrongpassword");
+        when(authenticationManager.authenticate(u)).thenReturn(null);
+        when(authenticationManager.authenticate(v)).thenThrow(DisabledException.class);
+        when(authenticationManager.authenticate(z)).thenThrow(BadCredentialsException.class);
+
+        final UserDetails r = Mockito.mock(UserDetails.class);
+        when(jwtUserDetailsService.loadUserByUsername("username")).thenReturn(r);
+        when(jwtTokenUtils.generateToken(r)).thenReturn("token");
+
+        final User user = new User();
+        user.setUsername("username");
+
+        when(userRepository.findByEmailIgnoreCase("email@example.com")).thenReturn(user);
+        when(userRepository.findByEmailIgnoreCase("none@example.com")).thenReturn(null);
+
+        assertThatThrownBy(
+                        () ->
+                                authenticationController.login(
+                                        new JWTRequest("none@example.com", "password")))
+                .isInstanceOf(UserNotFoundException.class);
+        assertThat(
+                        authenticationController
+                                .login(new JWTRequest("email@example.com", "password"))
+                                .getJwttoken())
+                .isEqualTo("token");
+        assertThatThrownBy(
+                        () ->
+                                authenticationController.login(
+                                        new JWTRequest("disabled", "password")))
+                .isInstanceOf(UnauthorizedException.class);
+        assertThatThrownBy(
+                        () ->
+                                authenticationController.login(
+                                        new JWTRequest("username", "wrongpassword")))
+                .isInstanceOf(UnauthorizedException.class);
+        assertThat(
+                        authenticationController
+                                .login(new JWTRequest("username", "password"))
+                                .getJwttoken())
+                .isEqualTo("token");
+    }
+}

From 5dd4dfec2c45f1a9509196b5ffb51834576148a4 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sat, 23 May 2020 18:45:57 +0200
Subject: [PATCH 103/176] test for curtains controller

---
 .../controller/CurtainsControllerTests.java   | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java
new file mode 100644
index 0000000..eebab51
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java
@@ -0,0 +1,128 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("Curtains controller test")
+public class CurtainsControllerTests {
+    @InjectMocks CurtainsController controller;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private CurtainsRepository curtainsService;
+
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private StateRepository stateRepository;
+
+    @Mock Principal principal;
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        when(principal.getName()).thenReturn("user");
+        Curtains curtains = new Curtains();
+        curtains.setIntensity(50);
+        curtains.setName("name");
+        curtains.setRoomId(42L);
+        when(deviceService.saveAsOwner(any(Curtains.class), eq("user"))).thenReturn(curtains);
+        doNothing().when(deviceService).throwIfRoomNotOwned(42L, "user");
+        DimmableSaveRequest toSend = new DimmableSaveRequest();
+        toSend.setRoomId(42L);
+        toSend.setIntensity(50);
+        toSend.setName("name");
+        Curtains returned = controller.create(toSend, principal);
+        assertThat(returned.getRoomId()).isEqualTo(toSend.getRoomId());
+        assertThat(returned.getName()).isEqualTo(toSend.getName());
+        assertTrue(returned.isOn());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        when(principal.getName()).thenReturn("user");
+        Curtains curtains = new Curtains();
+        curtains.setId(1L);
+        curtains.setIntensity(50);
+        curtains.setName("name");
+        curtains.setRoomId(42L);
+        when(deviceService.saveAsOwner(any(Curtains.class), eq("user"))).thenReturn(curtains);
+        DimmableSaveRequest toSend = new DimmableSaveRequest();
+        toSend.setId(1L);
+        toSend.setRoomId(42L);
+        toSend.setIntensity(50);
+        toSend.setName("name");
+        when(curtainsService.findById(1L)).thenReturn(Optional.of(curtains));
+        Curtains returned = controller.update(toSend, principal);
+        assertThat(returned.getRoomId()).isEqualTo(toSend.getRoomId());
+        assertThat(returned.getName()).isEqualTo(toSend.getName());
+        assertTrue(returned.isOn());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        when(principal.getName()).thenReturn("user");
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        controller.delete(42L, principal);
+    }
+
+    @Test
+    @SneakyThrows({NotFoundException.class, DuplicateStateException.class})
+    public void testSceneBinding() {
+        when(principal.getName()).thenReturn("user");
+        Curtains curtains = new Curtains();
+        when(curtainsService.findByIdAndUsername(24L, "user")).thenReturn(Optional.of(curtains));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = curtains.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
+        controller.sceneBinding(24L, 1L, principal);
+    }
+
+    @Test
+    public void testSceneBinding2() {
+        when(principal.getName()).thenReturn("user");
+        Curtains curtains = new Curtains();
+        when(curtainsService.findByIdAndUsername(24L, "user")).thenReturn(Optional.of(curtains));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = curtains.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(2);
+        assertThatThrownBy(() -> controller.sceneBinding(24L, 1L, principal))
+                .isInstanceOf(DuplicateStateException.class);
+    }
+}

From 5308ddec6f71560332052ae71a32649809248ca0 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 19:08:40 +0200
Subject: [PATCH 104/176] Some tests on SceneServiceTests

---
 .../smarthut/service/SceneServiceTests.java   | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java
new file mode 100644
index 0000000..b42f263
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java
@@ -0,0 +1,59 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class SceneServiceTests {
+
+    @InjectMocks private SceneService sceneService;
+
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private DevicePropagationService deviceService;
+
+    @Mock private DevicePopulationService devicePopulationService;
+
+    @Test
+    public void testFindByValidatedId() {
+        final Scene s = new Scene();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(s));
+        assertThat(sceneService.findByValidatedId(1L)).isSameAs(s);
+    }
+
+    @Test
+    public void testApply() {
+        when(deviceService.saveAllAsOwner(any(), eq("user"), eq(true), anyBoolean()))
+                .thenAnswer(i -> i.getArgument(0));
+        doNothing().when(deviceService).saveAllAsGuestSceneApplication(any(), eq("user"), eq(42L));
+        doNothing().when(devicePopulationService).populateComputedFields(any());
+
+        final Scene s = new Scene();
+        final DimmableState st = new DimmableState();
+        final DimmableLight d = new DimmableLight();
+        d.setIntensity(20);
+        st.setDevice(d);
+        st.setIntensity(40);
+        s.getStates().add(st);
+
+        assertThat(sceneService.apply(s, "user", false)).containsExactly(d);
+        assertThat(d.getIntensity()).isEqualTo(40);
+
+        d.setIntensity(20);
+
+        assertThat(sceneService.applyAsGuest(s, "user", 42L)).containsExactly(d);
+        assertThat(d.getIntensity()).isEqualTo(40);
+    }
+}

From 6dedf593322edd891507b67892fa5a38e380c155 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sat, 23 May 2020 19:46:35 +0200
Subject: [PATCH 105/176] added a couple of tests to guestcontrollertests

---
 .../controller/GuestControllerTests.java      | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index 26af2b6..6170571 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -1,13 +1,19 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestPermissionsRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GuestsUpdateRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.UserResponse;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.EagerUserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import java.security.Principal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -89,4 +95,50 @@ public class GuestControllerTests {
         when(userRepository.findByUsername("user")).thenReturn(user);
         assertThat(guestController.findGuests(mockPrincipal).isEmpty());
     }
+
+    @Test
+    public void testUpdatePermission() {
+        GuestPermissionsRequest permission = new GuestPermissionsRequest();
+        permission.setCameraEnabled(true);
+        when(mockPrincipal.getName()).thenReturn("user");
+        User user = new User();
+        user.setCameraEnabled(true);
+        when(userRepository.findByUsername("user")).thenReturn(user);
+        when(userRepository.save(user)).thenReturn(user);
+        assertTrue(guestController.updatePermissions(permission, mockPrincipal).isCameraEnabled());
+    }
+
+    @Test
+    public void testSetGuests() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        ArrayList users = new ArrayList<>();
+        User user1 = new User();
+        user1.setId(1L);
+        user1.getGuests().add(new User());
+        user1.getGuests().add(new User());
+        user1.getGuests().add(new User());
+        User user2 = new User();
+        user2.setId(2L);
+        User user3 = new User();
+        user3.setId(3L);
+        users.add(user1);
+        users.add(user2);
+        users.add(user3);
+        ArrayList ids = new ArrayList<>();
+        ids.add(1L);
+        ids.add(2L);
+        ids.add(3L);
+        GuestsUpdateRequest request = new GuestsUpdateRequest();
+        request.setIds(ids);
+        when(userRepository.findAllById(request.getIds())).thenReturn(users);
+        when(userRepository.findByUsername("user")).thenReturn(user1);
+        when(userRepository.saveAll(Set.copyOf(user1.getGuests()))).thenReturn(null);
+        when(userRepository.save(any(User.class))).thenReturn(null);
+        when(userRepository.saveAll(users)).thenReturn(users);
+        List returned = guestController.setGuests(request, mockPrincipal);
+        assertThat(returned.size()).isEqualTo(3);
+        assertTrue(returned.contains(user1));
+        assertTrue(returned.contains(user2));
+        assertTrue(returned.contains(user3));
+    }
 }

From 79df13086835903301a6ba196d4f0dd7be23d90d Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 23:23:24 +0200
Subject: [PATCH 106/176] Code smells fix

---
 .../smarthut/models/ConfirmationToken.java         |  2 ++
 .../sanmarinoes/smarthut/models/Switchable.java    |  1 +
 .../smarthut/service/AutomationService.java        | 14 +++++++++-----
 .../smarthut/service/DeviceService.java            |  7 ++-----
 .../controller/ButtonDimmerControllerTests.java    |  3 ++-
 .../controller/CurtainsControllerTests.java        |  6 +++---
 .../smarthut/controller/GuestControllerTests.java  |  6 +++---
 .../controller/KnobDimmerControllerTests.java      |  3 ++-
 .../controller/SecurityCameraControllerTests.java  |  6 +++---
 .../smarthut/controller/SwitchControllerTests.java |  3 ++-
 .../smarthut/service/DeviceServiceTests.java       |  4 +---
 11 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index 5f61bc9..ab858b7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.UUID;
 import javax.persistence.*;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 @Entity
@@ -26,6 +27,7 @@ public class ConfirmationToken {
     }
 
     @Temporal(TemporalType.TIMESTAMP)
+    @NonNull
     private Date createdDate;
 
     @OneToOne(targetEntity = User.class, fetch = FetchType.EAGER)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index d976758..2f0f64e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 /** A device that can be turned either on or off */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
 public abstract class Switchable extends OutputDevice {
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
index 08c0bf6..3887b02 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
@@ -1,9 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.AutomationRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Trigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.TriggerRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -12,13 +9,16 @@ import org.springframework.stereotype.Component;
 public class AutomationService {
     private final AutomationRepository automationRepository;
     private final TriggerRepository> triggerRepository;
+    private final ConditionRepository> conditionRepository;
 
     @Autowired
     public AutomationService(
             AutomationRepository automationRepository,
-            TriggerRepository> triggerRepository) {
+            TriggerRepository> triggerRepository,
+            ConditionRepository> conditionRepository) {
         this.automationRepository = automationRepository;
         this.triggerRepository = triggerRepository;
+        this.conditionRepository = conditionRepository;
     }
 
     public List> findTriggersByDeviceId(Long deviceId) {
@@ -28,4 +28,8 @@ public class AutomationService {
     public Automation findByVerifiedId(Long automationId) {
         return automationRepository.findById(automationId).orElseThrow();
     }
+
+    public List> findAllConditionsByAutomationId(Long automationId) {
+        return conditionRepository.findAllByAutomationId(automationId);
+    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
index 07adb5a..43607d0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
@@ -22,7 +22,6 @@ public class DeviceService {
     private final EagerUserRepository userRepository;
     private final DevicePopulationService devicePopulationService;
     private final DevicePropagationService devicePropagationService;
-    private final ConditionRepository> conditionRepository;
 
     @Autowired
     public DeviceService(
@@ -32,8 +31,7 @@ public class DeviceService {
             AutomationService automationService,
             EagerUserRepository userRepository,
             DevicePopulationService devicePopulationService,
-            DevicePropagationService devicePropagationService,
-            ConditionRepository> conditionRepository) {
+            DevicePropagationService devicePropagationService) {
         this.deviceRepository = deviceRepository;
         this.sceneService = sceneService;
         this.roomRepository = roomRepository;
@@ -41,7 +39,6 @@ public class DeviceService {
         this.userRepository = userRepository;
         this.devicePopulationService = devicePopulationService;
         this.devicePropagationService = devicePropagationService;
-        this.conditionRepository = conditionRepository;
     }
 
     public void throwIfRoomNotOwned(Long roomId, String username) throws NotFoundException {
@@ -65,7 +62,7 @@ public class DeviceService {
                 .filter(
                         a -> {
                             final List> conditions =
-                                    conditionRepository.findAllByAutomationId(a.getId());
+                                    automationService.findAllConditionsByAutomationId(a.getId());
                             if (conditions.isEmpty()) return true;
                             return conditions.stream().allMatch(Condition::triggered);
                         })
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
index 39f5b16..25cbb91 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerControllerTests.java
@@ -15,6 +15,7 @@ import java.security.Principal;
 import java.util.Optional;
 import java.util.Set;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -73,7 +74,7 @@ public class ButtonDimmerControllerTests {
         doNothing().when(service).deleteByIdAsOwner(eq(42L), eq("user"));
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
-        controller.delete(42L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L, principal));
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java
index eebab51..448a06e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/CurtainsControllerTests.java
@@ -15,6 +15,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.Optional;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -91,11 +92,10 @@ public class CurtainsControllerTests {
         doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
-        controller.delete(42L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L, principal));
     }
 
     @Test
-    @SneakyThrows({NotFoundException.class, DuplicateStateException.class})
     public void testSceneBinding() {
         when(principal.getName()).thenReturn("user");
         Curtains curtains = new Curtains();
@@ -107,7 +107,7 @@ public class CurtainsControllerTests {
         State s = curtains.cloneState();
         when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
         when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
-        controller.sceneBinding(24L, 1L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.sceneBinding(24L, 1L, principal));
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
index 6170571..96034ac 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestControllerTests.java
@@ -43,7 +43,7 @@ public class GuestControllerTests {
     @Test
     public void findAllEmptyTest() {
         List l = guestController.findAll();
-        assertThat(l.isEmpty());
+        assertThat(l).isEmpty();
     }
 
     @DisplayName(
@@ -85,7 +85,7 @@ public class GuestControllerTests {
     public void findHostsEmptyTest() {
         when(mockPrincipal.getName()).thenReturn("user");
         when(userRepository.findByUsername("user")).thenReturn(user);
-        assertThat(guestController.findHosts(mockPrincipal).isEmpty());
+        assertThat(guestController.findHosts(mockPrincipal)).isEmpty();
     }
 
     @DisplayName("Check that the guest list is empty")
@@ -93,7 +93,7 @@ public class GuestControllerTests {
     public void findGuestsEmptyTest() {
         when(mockPrincipal.getName()).thenReturn("user");
         when(userRepository.findByUsername("user")).thenReturn(user);
-        assertThat(guestController.findGuests(mockPrincipal).isEmpty());
+        assertThat(guestController.findGuests(mockPrincipal)).isEmpty();
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
index 3e17d48..f796312 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerControllerTests.java
@@ -15,6 +15,7 @@ import java.security.Principal;
 import java.util.Optional;
 import java.util.Set;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -73,7 +74,7 @@ public class KnobDimmerControllerTests {
         doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
-        controller.delete(42L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L, principal));
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java
index 5e2d429..1c7760b 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraControllerTests.java
@@ -16,6 +16,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.Optional;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -96,11 +97,10 @@ public class SecurityCameraControllerTests {
         doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
-        controller.delete(42L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L, principal));
     }
 
     @Test
-    @SneakyThrows({NotFoundException.class, DuplicateStateException.class})
     public void testSceneBinding() {
         when(principal.getName()).thenReturn("user");
         SecurityCamera camera = new SecurityCamera();
@@ -114,7 +114,7 @@ public class SecurityCameraControllerTests {
         when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
         when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
         // when(stateRepository.save(eq(state))).thenReturn(state);
-        controller.sceneBinding(24L, 1L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.sceneBinding(24L, 1L, principal));
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
index f0c985f..6d3787d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -77,7 +78,7 @@ public class SwitchControllerTests {
         doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
-        controller.deleteById(42L, principal);
+        Assertions.assertDoesNotThrow(() -> controller.deleteById(42L, principal));
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
index cc61142..01000ea 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
@@ -33,8 +33,6 @@ public class DeviceServiceTests {
 
     @Mock private DevicePropagationService devicePropagationService;
 
-    @Mock private ConditionRepository> conditionRepository;
-
     @InjectMocks private DeviceService deviceService;
 
     @Test
@@ -101,7 +99,7 @@ public class DeviceServiceTests {
         a.getScenes().add(sp);
 
         when(automationService.findTriggersByDeviceId(1L)).thenReturn(List.of(b));
-        when(conditionRepository.findAllByAutomationId(5L)).thenReturn(List.of(c));
+        when(automationService.findAllConditionsByAutomationId(5L)).thenReturn(List.of(c));
         when(automationService.findByVerifiedId(5L)).thenReturn(a);
         when(sceneService.findByValidatedId(4L)).thenReturn(s);
 

From 3fc5d9bfcb9c65f8deaea6e77a7cc83081da74ef Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 23:29:49 +0200
Subject: [PATCH 107/176] Code smells fix

---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index 2f0f64e..b73d105 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 
 /** A device that can be turned either on or off */
 @Entity
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 @Inheritance(strategy = InheritanceType.JOINED)
 public abstract class Switchable extends OutputDevice {
 

From d63ec73127775b8701ea78209c1a61b482546568 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sat, 23 May 2020 23:40:01 +0200
Subject: [PATCH 108/176] Code smells fix

---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index b73d105..f2d2c44 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -5,11 +5,9 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
 import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
-import lombok.EqualsAndHashCode;
 
 /** A device that can be turned either on or off */
 @Entity
-@EqualsAndHashCode(callSuper = false)
 @Inheritance(strategy = InheritanceType.JOINED)
 public abstract class Switchable extends OutputDevice {
 
@@ -23,7 +21,6 @@ public abstract class Switchable extends OutputDevice {
             })
     @GsonExclude
     @SocketGsonExclude
-    @EqualsAndHashCode.Exclude
     private Set inputs = new HashSet<>();
 
     protected Switchable(String kind) {

From 2f9585bd20cd2cb41ed474f6fbfaa84b0c0791a7 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 24 May 2020 12:18:28 +0200
Subject: [PATCH 109/176] Code smells fix

---
 .../controller/ButtonDimmerController.java     |  2 +-
 .../InputDeviceConnectionController.java       |  8 ++++----
 .../controller/KnobDimmerController.java       |  2 +-
 .../smarthut/controller/SwitchController.java  |  2 +-
 .../smarthut/dto/automation/TriggerDTO.java    |  3 ++-
 .../smarthut/models/ButtonDimmer.java          |  4 ++--
 .../smarthut/models/ConfirmationToken.java     | 18 ++++++++++++++++++
 .../sanmarinoes/smarthut/models/Dimmable.java  |  1 +
 .../sanmarinoes/smarthut/models/Dimmer.java    | 10 ++++++----
 .../smarthut/models/InputDevice.java           |  2 +-
 .../smarthut/models/KnobDimmer.java            |  2 +-
 .../sanmarinoes/smarthut/models/Switch.java    | 10 ++++++----
 .../smarthut/models/Switchable.java            | 15 +++++++++++++++
 .../smarthut/service/AutomationService.java    |  8 ++++----
 .../smarthut/service/DeviceService.java        |  9 ++++++---
 .../controller/SwitchControllerTests.java      |  6 +++---
 .../smarthut/model/ButtonDimmerTests.java      |  4 ++--
 .../smarthut/model/DimmerTests.java            |  5 +++--
 .../smarthut/model/KnobDimmerTests.java        |  2 +-
 .../smarthut/model/SwitchTests.java            | 10 +++++-----
 .../smarthut/service/DeviceServiceTests.java   |  8 ++++++--
 21 files changed, 89 insertions(+), 42 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
index 330c31a..6e163a1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
@@ -70,7 +70,7 @@ public class ButtonDimmerController
 
         deviceService.saveAllAsOwner(buttonDimmer.getOutputs(), principal.getName());
 
-        return buttonDimmer.getOutputs();
+        return buttonDimmer.getDimmables();
     }
 
     @DeleteMapping("/{id}")
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
index efde6e5..4d3bdcc 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
@@ -96,8 +96,8 @@ public abstract class InputDeviceConnectionController<
      * @return the list of output devices attached to the input device of id inputId
      * @throws NotFoundException if inputId or outputId are not valid
      */
-    protected Set addOutput(
-            Long inputId, List outputs, String username) throws NotFoundException {
+    protected Set addOutput(Long inputId, List outputs, String username)
+            throws NotFoundException {
         final Connection pair = checkConnectionIDs(inputId, outputs, username);
 
         for (final O o : pair.getOutputs()) {
@@ -116,8 +116,8 @@ public abstract class InputDeviceConnectionController<
      * @return the list of output devices attached to the input device of id inputId
      * @throws NotFoundException if inputId or outputId are not valid
      */
-    protected Set removeOutput(
-            Long inputId, List outputs, String username) throws NotFoundException {
+    protected Set removeOutput(Long inputId, List outputs, String username)
+            throws NotFoundException {
         final Connection pair = checkConnectionIDs(inputId, outputs, username);
 
         for (final O o : pair.getOutputs()) {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
index 266713d..7d46fe1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
@@ -62,7 +62,7 @@ public class KnobDimmerController extends InputDeviceConnectionController toModel();
+    public abstract Trigger toModel();
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
index e41265a..94628ba 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
@@ -18,14 +18,14 @@ public class ButtonDimmer extends Dimmer {
 
     /** Increases the current intensity level of the dimmable light by DIM_INCREMENT */
     public void increaseIntensity() {
-        for (Dimmable dl : getOutputs()) {
+        for (Dimmable dl : getDimmables()) {
             dl.setIntensity(dl.getIntensity() + DIM_INCREMENT);
         }
     }
 
     /** Decreases the current intensity level of the dimmable light by DIM_INCREMENT */
     public void decreaseIntensity() {
-        for (Dimmable dl : getOutputs()) {
+        for (Dimmable dl : getDimmables()) {
             dl.setIntensity(dl.getIntensity() - DIM_INCREMENT);
         }
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index ab858b7..ca250bc 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import java.util.Date;
+import java.util.Objects;
 import java.util.UUID;
 import javax.persistence.*;
 import lombok.Data;
@@ -43,4 +44,21 @@ public class ConfirmationToken {
         confirmToken = UUID.randomUUID().toString();
         resetPassword = false;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ConfirmationToken that = (ConfirmationToken) o;
+        return resetPassword == that.resetPassword
+                && Objects.equals(id, that.id)
+                && confirmToken.equals(that.confirmToken)
+                && createdDate.equals(that.createdDate)
+                && Objects.equals(user, that.user);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, confirmToken, createdDate, user, resetPassword);
+    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
index 95f8e0d..111537a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
@@ -23,6 +23,7 @@ public class Dimmable extends Switchable implements RangeTriggerable {
     @ManyToMany(mappedBy = "dimmables", cascade = CascadeType.DETACH)
     @GsonExclude
     @SocketGsonExclude
+    @EqualsAndHashCode.Exclude
     @Getter
     @Setter
     private Set dimmers = new HashSet<>();
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
index 205ddfd..c2185ee 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 
 /** Represents a generic dimmer input device */
 @Entity
@@ -20,6 +21,7 @@ public abstract class Dimmer extends InputDevice implements Connectable getOutputs() {
-        return this.dimmables;
+    public Set getOutputs() {
+        return Set.copyOf(this.dimmables);
     }
 
     /** Add a light to be controller by this dimmer */
@@ -44,10 +46,10 @@ public abstract class Dimmer extends InputDevice implements Connectable getOutputs() {
+    public Set getOutputs() {
         return Set.of();
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
index 494dbe5..479e58c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
@@ -25,7 +25,7 @@ public class KnobDimmer extends Dimmer implements RangeTriggerable {
      */
     public void setLightIntensity(int intensity) {
         this.intensity = intensity;
-        for (Dimmable dl : getOutputs()) {
+        for (Dimmable dl : getDimmables()) {
             dl.setIntensity(intensity);
         }
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
index ebc0113..72afd0e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.Set;
 import javax.persistence.*;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 
 /** A switch input device */
 @Entity
@@ -22,6 +23,7 @@ public class Switch extends InputDevice implements BooleanTriggerable, Connectab
     @GsonExclude
     @SocketGsonExclude
     @EqualsAndHashCode.Exclude
+    @Getter
     @JoinTable(
             name = "switch_switchable",
             joinColumns = @JoinColumn(name = "switch_id"),
@@ -64,17 +66,17 @@ public class Switch extends InputDevice implements BooleanTriggerable, Connectab
     }
 
     @Override
-    public Set getOutputs() {
-        return switchables;
+    public Set getOutputs() {
+        return Set.copyOf(switchables);
     }
 
     public void connect(Switchable output, boolean connect) {
         if (connect) {
             output.getSwitches().add(this);
-            getOutputs().add(output);
+            switchables.add(output);
         } else {
             output.getSwitches().remove(this);
-            getOutputs().remove(output);
+            switchables.remove(output);
         }
     }
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
index f2d2c44..058baf2 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
@@ -3,6 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.config.SocketGsonExclude;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import javax.persistence.*;
 
@@ -55,4 +56,18 @@ public abstract class Switchable extends OutputDevice {
         newState.setOn(isOn());
         return newState;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        Switchable that = (Switchable) o;
+        return isOn() == that.isOn();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), isOn());
+    }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
index 3887b02..265ace8 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java
@@ -21,15 +21,15 @@ public class AutomationService {
         this.conditionRepository = conditionRepository;
     }
 
-    public List> findTriggersByDeviceId(Long deviceId) {
-        return triggerRepository.findAllByDeviceId(deviceId);
+    public void findTriggersByDeviceId(Long deviceId, List> toPut) {
+        toPut.addAll(triggerRepository.findAllByDeviceId(deviceId));
     }
 
     public Automation findByVerifiedId(Long automationId) {
         return automationRepository.findById(automationId).orElseThrow();
     }
 
-    public List> findAllConditionsByAutomationId(Long automationId) {
-        return conditionRepository.findAllByAutomationId(automationId);
+    public void findAllConditionsByAutomationId(Long automationId, List> toPut) {
+        toPut.addAll(conditionRepository.findAllByAutomationId(automationId));
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
index 43607d0..ac63201 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceService.java
@@ -4,6 +4,7 @@ import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -52,7 +53,8 @@ public class DeviceService {
     public void triggerTriggers(Device device, final String username) {
 
         final long deviceId = device.getId();
-        final List> triggers = automationService.findTriggersByDeviceId(deviceId);
+        final List> triggers = new ArrayList<>();
+        automationService.findTriggersByDeviceId(deviceId, triggers);
 
         triggers.stream()
                 .filter(Trigger::triggered)
@@ -61,8 +63,9 @@ public class DeviceService {
                 .distinct()
                 .filter(
                         a -> {
-                            final List> conditions =
-                                    automationService.findAllConditionsByAutomationId(a.getId());
+                            final List> conditions = new ArrayList<>();
+                            automationService.findAllConditionsByAutomationId(
+                                    a.getId(), conditions);
                             if (conditions.isEmpty()) return true;
                             return conditions.stream().allMatch(Condition::triggered);
                         })
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
index 6d3787d..ef47b96 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchControllerTests.java
@@ -98,7 +98,7 @@ public class SwitchControllerTests {
         ArrayList helper = new ArrayList();
         helper.add(light);
         helper.add(light2);
-        when(deviceService.saveAllAsOwner(aSwitch.getOutputs(), principal.getName()))
+        when(deviceService.saveAllAsOwner(aSwitch.getSwitchables(), principal.getName()))
                 .thenReturn(helper);
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
@@ -123,7 +123,7 @@ public class SwitchControllerTests {
         ArrayList helper = new ArrayList();
         helper.add(light);
         helper.add(light2);
-        when(deviceService.saveAllAsOwner(aSwitch.getOutputs(), principal.getName()))
+        when(deviceService.saveAllAsOwner(aSwitch.getSwitchables(), principal.getName()))
                 .thenReturn(helper);
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
@@ -148,7 +148,7 @@ public class SwitchControllerTests {
         ArrayList helper = new ArrayList();
         helper.add(light);
         helper.add(light2);
-        when(deviceService.saveAllAsOwner(aSwitch.getOutputs(), principal.getName()))
+        when(deviceService.saveAllAsOwner(aSwitch.getSwitchables(), principal.getName()))
                 .thenReturn(helper);
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
index 421ca0f..7aab4ce 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
@@ -39,7 +39,7 @@ public class ButtonDimmerTests {
         @DisplayName(" increase the intensity ")
         public void increase() {
             buttonDimmer.increaseIntensity();
-            for (Dimmable dl : buttonDimmer.getOutputs()) {
+            for (Dimmable dl : buttonDimmer.getDimmables()) {
                 assertTrue(dl.getIntensity() > 10);
             }
         }
@@ -48,7 +48,7 @@ public class ButtonDimmerTests {
         @DisplayName(" decrease the intensity ")
         public void decrease() {
             buttonDimmer.decreaseIntensity();
-            for (Dimmable dl : buttonDimmer.getOutputs()) {
+            for (Dimmable dl : buttonDimmer.getDimmables()) {
                 assertTrue(dl.getIntensity() < 10);
             }
         }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
index 5f1ec32..6dfc46c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
@@ -34,12 +34,13 @@ public class DimmerTests {
     @DisplayName("connect off")
     public void connectOff() {
         DimmableLight d = new DimmableLight();
+        d.setId(35L);
         d.getDimmers().add(this.dimmer);
-        dimmer.getOutputs().add(d);
+        dimmer.getDimmables().add(d);
         dimmer.connect(d, false);
 
         assertFalse(d.getDimmers().contains((this.dimmer)));
 
-        assertFalse((this.dimmer.getOutputs().contains(d)));
+        assertFalse(this.dimmer.getOutputs().contains(d));
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
index 181dc57..def3f7f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
@@ -39,7 +39,7 @@ public class KnobDimmerTests {
         @DisplayName(" set the intensity ")
         public void increase() {
             knobDimmer.setLightIntensity(30);
-            for (Dimmable dl : knobDimmer.getOutputs()) {
+            for (Dimmable dl : knobDimmer.getDimmables()) {
                 assertEquals(30, dl.getIntensity());
             }
         }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
index b05bb94..3358b84 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
@@ -20,9 +20,9 @@ public class SwitchTests {
         RegularLight regularLight = new RegularLight();
         DimmableLight dimmableLight = new DimmableLight();
         SmartPlug smartPlug = new SmartPlug();
-        this.aSwitch.getOutputs().add(regularLight);
-        this.aSwitch.getOutputs().add(dimmableLight);
-        this.aSwitch.getOutputs().add(smartPlug);
+        this.aSwitch.getSwitchables().add(regularLight);
+        this.aSwitch.getSwitchables().add(dimmableLight);
+        this.aSwitch.getSwitchables().add(smartPlug);
     }
 
     @Test
@@ -80,7 +80,7 @@ public class SwitchTests {
     @DisplayName("Checks that toggling on sets all elements of the Set on as well")
     public void toggleEffctOnSet() {
         aSwitch.toggle();
-        for (final Switchable s : aSwitch.getOutputs()) {
+        for (final Switchable s : aSwitch.getSwitchables()) {
             assertTrue(s.isOn());
         }
     }
@@ -90,7 +90,7 @@ public class SwitchTests {
     public void toggleOffEffectOnElementes() {
         aSwitch.setOn(true);
         aSwitch.toggle();
-        for (final Switchable s : aSwitch.getOutputs()) {
+        for (final Switchable s : aSwitch.getSwitchables()) {
             assertFalse(s.isOn());
         }
     }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
index 01000ea..ce7e5b9 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
@@ -98,8 +98,12 @@ public class DeviceServiceTests {
 
         a.getScenes().add(sp);
 
-        when(automationService.findTriggersByDeviceId(1L)).thenReturn(List.of(b));
-        when(automationService.findAllConditionsByAutomationId(5L)).thenReturn(List.of(c));
+        doAnswer(i -> ((List>) i.getArgument(1)).add(b))
+                .when(automationService)
+                .findTriggersByDeviceId(eq(1L), any());
+        doAnswer(i -> ((List>) i.getArgument(1)).add(c))
+                .when(automationService)
+                .findAllConditionsByAutomationId(eq(5L), any());
         when(automationService.findByVerifiedId(5L)).thenReturn(a);
         when(sceneService.findByValidatedId(4L)).thenReturn(s);
 

From 838aaf93eeb9b4b110ab379c5c50a1e6de3c50f8 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 24 May 2020 12:31:39 +0200
Subject: [PATCH 110/176] Code smells fix

---
 .../smarthut/models/Automation.java           | 18 +++++++-------
 .../smarthut/models/Condition.java            | 24 +++++++++----------
 .../smarthut/models/RangeCondition.java       |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
index cb04e9d..2a27ee9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
@@ -18,23 +18,23 @@ public class Automation {
     @ApiModelProperty(hidden = true)
     private long id;
 
-    @ManyToOne
-    @JoinColumn(name = "user_id", updatable = false, insertable = false)
-    @GsonExclude
-    private User user;
-
-    @Column(name = "user_id", nullable = false)
-    @GsonExclude
-    private Long userId;
-
     @OneToMany(mappedBy = "automation", orphanRemoval = true, cascade = CascadeType.REMOVE)
     private Set> triggers = new HashSet<>();
 
     @OneToMany(mappedBy = "automation", cascade = CascadeType.REMOVE)
     private Set scenes = new HashSet<>();
 
+    @ManyToOne
+    @JoinColumn(name = "user_id", updatable = false, insertable = false)
+    @GsonExclude
+    private User user;
+
     @OneToMany(mappedBy = "automation", orphanRemoval = true, cascade = CascadeType.REMOVE)
     private Set> conditions = new HashSet<>();
 
+    @Column(name = "user_id", nullable = false)
+    @GsonExclude
+    private Long userId;
+
     @NotEmpty private String name;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
index 70bad76..62fa6df 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Condition.java
@@ -21,16 +21,25 @@ public abstract class Condition {
         return kind;
     }
 
+    @ManyToOne(targetEntity = Device.class)
+    @JoinColumn(name = "device_id", updatable = false, insertable = false)
+    @GsonExclude
+    private D device;
+
+    @Column(name = "automation_id", nullable = false)
+    private Long automationId;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id", updatable = false, nullable = false, unique = true)
     @ApiModelProperty(hidden = true)
     private long id;
 
-    @ManyToOne(targetEntity = Device.class)
-    @JoinColumn(name = "device_id", updatable = false, insertable = false)
+    @ManyToOne
+    @JoinColumn(name = "automation_id", updatable = false, insertable = false)
     @GsonExclude
-    private D device;
+    @EqualsAndHashCode.Exclude
+    private Automation automation;
 
     /**
      * The device this condition belongs to, as a foreign key id. To use when updating and inserting
@@ -39,15 +48,6 @@ public abstract class Condition {
     @Column(name = "device_id", nullable = false)
     private Long deviceId;
 
-    @ManyToOne
-    @JoinColumn(name = "automation_id", updatable = false, insertable = false)
-    @GsonExclude
-    @EqualsAndHashCode.Exclude
-    private Automation automation;
-
-    @Column(name = "automation_id", nullable = false)
-    private Long automationId;
-
     public abstract boolean triggered();
 
     public Condition setAutomationId(Long automationId) {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
index b5a7a5d..1a92fa9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeCondition.java
@@ -17,12 +17,12 @@ public class RangeCondition extends Condition {
     @Getter
     @Setter
     @Column(nullable = false)
-    private Operator operator;
+    private double range;
 
     @Getter
     @Setter
     @Column(nullable = false)
-    private double range;
+    private Operator operator;
 
     @Override
     public boolean triggered() {

From 7652610c5d85d2417261880f7918a2aed4d9f968 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 24 May 2020 14:16:07 +0200
Subject: [PATCH 111/176] I can't mock a method

---
 .../RegularLightControllerTests.java          | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
new file mode 100644
index 0000000..f3c2136
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
@@ -0,0 +1,126 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLightRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
+import java.security.Principal;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class RegularLightControllerTests {
+
+    @InjectMocks private RegularLightController regularLightController;
+
+    @Mock private RegularLightRepository regularLightRepository;
+
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private StateRepository stateRepository;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private Principal mockPrincipal;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private DeviceRepository deviceRepository;
+
+    @BeforeEach
+    public void setup() {
+        when(mockPrincipal.getName()).thenReturn("user");
+    }
+
+    private void checkRegularLightAgainstRequest(
+            final RegularLight toCheck, final SwitchableSaveRequest request) {
+        assertThat(toCheck).isNotNull();
+        assertThat(toCheck.isOn()).isEqualTo(request.isOn());
+        assertThat(toCheck.getName()).isEqualTo(request.getName());
+        assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
+    }
+
+    @Test
+    @DisplayName("when creating should return the same object")
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(deviceService.saveAsOwner(any(RegularLight.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final SwitchableSaveRequest toSend = new SwitchableSaveRequest();
+        toSend.setName("rl");
+        toSend.setRoomId(20L);
+        toSend.setOn(true);
+
+        final RegularLight regularLight = regularLightController.create(toSend, mockPrincipal);
+
+        checkRegularLightAgainstRequest(regularLight, toSend);
+    }
+
+    @Test
+    @DisplayName("when updating should return the same object")
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+
+        final SwitchableSaveRequest toSend = new SwitchableSaveRequest();
+        toSend.setId(50L);
+        toSend.setName("rl");
+        toSend.setRoomId(20L);
+        toSend.setOn(true);
+
+        final RegularLight toUpdate = new RegularLight();
+        toUpdate.setName("OOO");
+        toUpdate.setRoomId(40L);
+        toSend.setId(50L);
+        toUpdate.setOn(false);
+
+        when(regularLightRepository.findByIdAndUserId(anyLong(), anyLong()))
+                .thenReturn(java.util.Optional.of(toUpdate));
+
+        when(deviceService.saveAsGuest(any(RegularLight.class), eq("user"), anyLong()))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        when(Utils.returnIfGuest(
+                        any(UserRepository.class),
+                        any(RegularLight.class),
+                        anyLong(),
+                        any(Principal.class)))
+                .thenAnswer(i -> i.getArguments()[1]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final RegularLight regularLight = regularLightController.update(toSend, mockPrincipal, 20L);
+
+        checkRegularLightAgainstRequest(regularLight, toSend);
+    }
+}

From ea8ac95b7a7852dc728c6c8617d7d348646266dc Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 24 May 2020 14:55:59 +0200
Subject: [PATCH 112/176] WIP

---
 .../DimmableLightControllerTests.java         | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
new file mode 100644
index 0000000..8c18d81
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
@@ -0,0 +1,180 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.dimmableLightController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.controller.DimmableLightController;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLightRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
+import java.security.Principal;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class DimmableLightControllerTests {
+
+    @InjectMocks private DimmableLightController dimmableLightController;
+
+    @Mock private DimmableLightRepository dimmableLightRepository;
+
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private StateRepository stateRepository;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private Principal mockPrincipal;
+
+    @Mock private UserRepository userRepository;
+
+    @Mock private DeviceRepository deviceRepository;
+
+    @BeforeEach
+    public void setup() {
+        when(mockPrincipal.getName()).thenReturn("user");
+    }
+
+    private void checkDimmableLightAgainstRequest(
+            final DimmableLight toCheck, final DimmableSaveRequest request) {
+        assertThat(toCheck).isNotNull();
+        assertThat(toCheck.getIntensity()).isEqualTo(request.getIntensity());
+        assertThat(toCheck.getName()).isEqualTo(request.getName());
+        assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
+    }
+
+    @Test
+    @DisplayName("when creating should return the same object")
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(deviceService.saveAsOwner(any(DimmableLight.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final DimmableSaveRequest toSend = new DimmableSaveRequest();
+        toSend.setName("rl");
+        toSend.setRoomId(20L);
+        toSend.setIntensity(35);
+
+        final DimmableLight regularLight = dimmableLightController.create(toSend, mockPrincipal);
+
+        checkDimmableLightAgainstRequest(regularLight, toSend);
+    }
+
+    @Test
+    @DisplayName("when updating should return the same object")
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+
+        final DimmableSaveRequest toSend = new DimmableSaveRequest();
+        toSend.setId(50L);
+        toSend.setName("rl");
+        toSend.setRoomId(20L);
+        toSend.setIntensity(35);
+
+        final DimmableLight toUpdate = new DimmableLight();
+        toUpdate.setName("OOO");
+        toUpdate.setRoomId(40L);
+        toSend.setId(50L);
+        toUpdate.setOn(false);
+
+        when(dimmableLightRepository.findByIdAndUserId(anyLong(), anyLong()))
+                .thenReturn(java.util.Optional.of(toUpdate));
+
+        when(deviceService.saveAsGuest(any(DimmableLight.class), eq("user"), anyLong()))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        when(Utils.returnIfGuest(
+                        any(UserRepository.class),
+                        any(DimmableLight.class),
+                        anyLong(),
+                        any(Principal.class)))
+                .thenAnswer(i -> i.getArguments()[1]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final DimmableLight dimmableLight =
+                dimmableLightController.update(toSend, mockPrincipal, 20L);
+
+        checkDimmableLightAgainstRequest(dimmableLight, toSend);
+    }
+
+    @Test
+    @DisplayName("an existing id should succeed")
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        Assertions.assertDoesNotThrow(() -> dimmableLightController.delete(42L, mockPrincipal));
+    }
+
+    @Test
+    public void testSceneBinding() {
+        DimmableLight dimmableLight = new DimmableLight();
+        when(dimmableLightRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(dimmableLight));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = dimmableLight.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
+        Assertions.assertDoesNotThrow(
+                () -> dimmableLightController.sceneBinding(24L, 1L, mockPrincipal));
+    }
+
+    @Test
+    public void testSceneBinding2() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        DimmableLight dimmableLight = new DimmableLight();
+        when(dimmableLightRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(dimmableLight));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = dimmableLight.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(2);
+        assertThatThrownBy(() -> dimmableLightController.sceneBinding(24L, 1L, mockPrincipal))
+                .isInstanceOf(DuplicateStateException.class);
+    }
+}

From bb9ccd2d6d50fa1fbcf1ca2b498f85e088758429 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 24 May 2020 15:01:23 +0200
Subject: [PATCH 113/176] WIP

---
 .../controller/ThermostatControllerTests.java | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
index db66ddd..2f23934 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
@@ -8,16 +9,20 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.ThermostatPopulationService;
 import java.math.BigDecimal;
 import java.security.Principal;
+import java.util.Optional;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -128,4 +133,37 @@ public class ThermostatControllerTests {
 
         Assertions.assertDoesNotThrow(() -> thermostatController.deleteById(42L, mockPrincipal));
     }
+
+    @Test
+    public void testSceneBinding() {
+        Thermostat thermostat = new Thermostat();
+        when(thermostatRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(thermostat));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = thermostat.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
+        Assertions.assertDoesNotThrow(
+                () -> thermostatController.sceneBinding(24L, 1L, mockPrincipal));
+    }
+
+    @Test
+    public void testSceneBinding2() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        Thermostat thermostat = new Thermostat();
+        when(thermostatRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(thermostat));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = thermostat.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(2);
+        assertThatThrownBy(() -> thermostatController.sceneBinding(24L, 1L, mockPrincipal))
+                .isInstanceOf(DuplicateStateException.class);
+    }
 }

From d57a218fc94b472bd2dfba8e547aecd03c9193ef Mon Sep 17 00:00:00 2001
From: omenem 
Date: Sun, 24 May 2020 15:04:17 +0200
Subject: [PATCH 114/176] WIP

---
 .../controller/DimmableLightControllerTests.java         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
index 8c18d81..c73b9be 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
@@ -1,4 +1,4 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.dimmableLightController;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -8,18 +8,17 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.controller.DimmableLightController;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLightRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
@@ -152,7 +151,7 @@ public class DimmableLightControllerTests {
                 .thenReturn(Optional.of(dimmableLight));
         Scene scene = new Scene();
         scene.setId(1L);
-        SwitchableState state = new SwitchableState();
+        DimmableState state = new DimmableState();
         state.setSceneId(1L);
         State s = dimmableLight.cloneState();
         when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
@@ -169,7 +168,7 @@ public class DimmableLightControllerTests {
                 .thenReturn(Optional.of(dimmableLight));
         Scene scene = new Scene();
         scene.setId(1L);
-        SwitchableState state = new SwitchableState();
+        DimmableState state = new DimmableState();
         state.setSceneId(1L);
         State s = dimmableLight.cloneState();
         when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));

From 86ca38cd47595b755e1425943191378568025a4e Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sun, 24 May 2020 17:42:53 +0200
Subject: [PATCH 115/176] added a couple of tests to smartPlugControllerTests

---
 .../controller/SmartPlugControllerTests.java  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
index 3907f3d..86a5c7f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugControllerTests.java
@@ -9,11 +9,14 @@ import static org.mockito.Mockito.when;
 import static org.springframework.test.util.AssertionErrors.fail;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.math.BigDecimal;
 import java.security.Principal;
 import java.util.Optional;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,6 +38,10 @@ public class SmartPlugControllerTests {
 
     @Mock private DeviceService deviceService;
 
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private StateRepository stateRepository;
+
     private final User u;
 
     public SmartPlugControllerTests() {
@@ -91,4 +98,51 @@ public class SmartPlugControllerTests {
         doNothing().when(deviceService).deleteByIdAsOwner(42L, "user");
         Assertions.assertDoesNotThrow(() -> smartPlugController.deleteById(42L, mockPrincipal));
     }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testResetMeter() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        SmartPlug s = new SmartPlug();
+        s.setId(24L);
+        when(smartPlugRepository.findByIdAndUsername(24L, "user")).thenReturn(Optional.of(s));
+        s.resetTotalConsumption();
+        when(smartPlugRepository.save(s)).thenReturn(s);
+        SmartPlug toCheck = smartPlugController.resetMeter(24L, mockPrincipal);
+        assertThat(toCheck.getTotalConsumption()).isEqualTo(new BigDecimal(0));
+    }
+
+    @Test
+    public void testSceneBinding() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        SmartPlug smartPlug = new SmartPlug();
+        when(smartPlugRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(smartPlug));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = smartPlug.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
+        Assertions.assertDoesNotThrow(
+                () -> smartPlugController.sceneBinding(24L, 1L, mockPrincipal));
+    }
+
+    @Test
+    public void testSceneBinding2() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        SmartPlug smartPlug = new SmartPlug();
+        when(smartPlugRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(smartPlug));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = smartPlug.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(2);
+        assertThatThrownBy(() -> smartPlugController.sceneBinding(24L, 1L, mockPrincipal))
+                .isInstanceOf(DuplicateStateException.class);
+    }
 }

From d25bcf350764418960ecc6c87020cf071cf3aea2 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sun, 24 May 2020 18:11:22 +0200
Subject: [PATCH 116/176] added RangeConditionControllerTests

---
 .../RangeConditionControllerTests.java        | 108 ++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionControllerTests.java
new file mode 100644
index 0000000..563636c
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeConditionControllerTests.java
@@ -0,0 +1,108 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeConditionOrTriggerSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("RangeConditionController tests")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class RangeConditionControllerTests {
+    @InjectMocks private RangeConditionController controller;
+
+    @Mock private RangeConditionRepository repository;
+
+    @Mock private Principal principal;
+
+    @Test
+    public void testCreate() {
+        RangeCondition condition = new RangeCondition();
+        condition.setRange(40L);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        condition.setOperator(Operator.EQUAL);
+        when(repository.save(condition)).thenReturn(condition);
+        RangeConditionOrTriggerSaveRequest toSend = new RangeConditionOrTriggerSaveRequest();
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOperator(Operator.EQUAL);
+        toSend.setRange(40L);
+        RangeCondition returned = controller.create(toSend);
+        assertThat(returned.getRange()).isEqualTo(toSend.getRange());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getOperator()).isEqualTo(toSend.getOperator());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        RangeCondition condition = new RangeCondition();
+        condition.setRange(40L);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        condition.setOperator(Operator.EQUAL);
+        when(repository.save(condition)).thenReturn(condition);
+        RangeConditionOrTriggerSaveRequest toSend = new RangeConditionOrTriggerSaveRequest();
+        toSend.setId(34L);
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOperator(Operator.EQUAL);
+        toSend.setRange(40L);
+        when(repository.findById(34L)).thenReturn(Optional.of(condition));
+        RangeCondition returned = controller.update(toSend);
+        assertThat(returned.getRange()).isEqualTo(toSend.getRange());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getOperator()).isEqualTo(toSend.getOperator());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    public void testGetAll() {
+        RangeCondition condition1 = new RangeCondition();
+        condition1.setAutomationId(1L);
+        RangeCondition condition2 = new RangeCondition();
+        condition2.setAutomationId(1L);
+        RangeCondition condition3 = new RangeCondition();
+        condition3.setAutomationId(1L);
+        ArrayList list = new ArrayList<>();
+        list.add(condition1);
+        list.add(condition2);
+        list.add(condition3);
+        when(repository.findAllByAutomationId(42L)).thenReturn(list);
+        List returned = controller.getAll(42L);
+        assertThat(returned).contains(condition1);
+        assertThat(returned).contains(condition2);
+        assertThat(returned).contains(condition3);
+        assertThat(returned.size()).isEqualTo(3);
+    }
+
+    @Test
+    public void testDelete() {
+        doNothing().when(repository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+}

From 7b05718286c9d8ada571fccce110bb2d81651c93 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sun, 24 May 2020 22:23:07 +0200
Subject: [PATCH 117/176] added ThermostatConditionControllerTests

---
 .../ThermostatConditionControllerTests.java   | 108 ++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionControllerTests.java
new file mode 100644
index 0000000..2210ce4
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatConditionControllerTests.java
@@ -0,0 +1,108 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ThermostatConditionSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("ThermostatConditionController tests")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class ThermostatConditionControllerTests {
+    @InjectMocks private ThermostatConditionController controller;
+
+    @Mock private ThermostatConditionRepository repository;
+
+    @Mock private Principal principal;
+
+    @Test
+    public void testCreate() {
+        ThermostatCondition condition = new ThermostatCondition();
+        condition.setMode(Thermostat.Mode.HEATING);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        condition.setOperator(ThermostatCondition.Operator.EQUAL);
+        when(repository.save(condition)).thenReturn(condition);
+        ThermostatConditionSaveRequest toSend = new ThermostatConditionSaveRequest();
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOperator(ThermostatCondition.Operator.EQUAL);
+        toSend.setMode(Thermostat.Mode.HEATING);
+        ThermostatCondition returned = controller.create(toSend);
+        assertThat(returned.getMode()).isEqualTo(toSend.getMode());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getOperator()).isEqualTo(toSend.getOperator());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        ThermostatCondition condition = new ThermostatCondition();
+        condition.setMode(Thermostat.Mode.HEATING);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        condition.setOperator(ThermostatCondition.Operator.EQUAL);
+        when(repository.save(condition)).thenReturn(condition);
+        ThermostatConditionSaveRequest toSend = new ThermostatConditionSaveRequest();
+        toSend.setId(34L);
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOperator(ThermostatCondition.Operator.EQUAL);
+        toSend.setMode(Thermostat.Mode.HEATING);
+        when(repository.findById(34L)).thenReturn(Optional.of(condition));
+        ThermostatCondition returned = controller.update(toSend);
+        assertThat(returned.getMode()).isEqualTo(toSend.getMode());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getOperator()).isEqualTo(toSend.getOperator());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    public void testGetAll() {
+        ThermostatCondition condition1 = new ThermostatCondition();
+        condition1.setAutomationId(1L);
+        ThermostatCondition condition2 = new ThermostatCondition();
+        condition2.setAutomationId(1L);
+        ThermostatCondition condition3 = new ThermostatCondition();
+        condition3.setAutomationId(1L);
+        ArrayList list = new ArrayList<>();
+        list.add(condition1);
+        list.add(condition2);
+        list.add(condition3);
+        when(repository.findAllByAutomationId(42L)).thenReturn(list);
+        List returned = controller.getAll(42L);
+        assertThat(returned).contains(condition1);
+        assertThat(returned).contains(condition2);
+        assertThat(returned).contains(condition3);
+        assertThat(returned.size()).isEqualTo(3);
+    }
+
+    @Test
+    public void testDelete() {
+        doNothing().when(repository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+}

From 4253e652411414f3a455e516626c70ec85ef7ad7 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 24 May 2020 22:27:00 +0200
Subject: [PATCH 118/176] Fixes

---
 .../smarthut/config/JWTRequestFilter.java     | 10 ++++++--
 .../RegularLightControllerTests.java          | 23 ++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java
index 3cfc094..f5d7d18 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java
@@ -18,9 +18,15 @@ import org.springframework.web.filter.OncePerRequestFilter;
 @Component
 public class JWTRequestFilter extends OncePerRequestFilter {
 
-    @Autowired private JWTUserDetailsService jwtUserDetailsService;
+    private final JWTUserDetailsService jwtUserDetailsService;
+    private final JWTTokenUtils jwtTokenUtils;
 
-    @Autowired private JWTTokenUtils jwtTokenUtils;
+    @Autowired
+    public JWTRequestFilter(
+            JWTUserDetailsService jwtUserDetailsService, JWTTokenUtils jwtTokenUtils) {
+        this.jwtUserDetailsService = jwtUserDetailsService;
+        this.jwtTokenUtils = jwtTokenUtils;
+    }
 
     @Override
     protected void doFilterInternal(
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
index f3c2136..1e4523f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
@@ -9,16 +9,10 @@ import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLightRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.security.Principal;
+import java.util.Optional;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -109,12 +103,13 @@ public class RegularLightControllerTests {
         when(deviceService.saveAsGuest(any(RegularLight.class), eq("user"), anyLong()))
                 .thenAnswer(i -> i.getArguments()[0]);
 
-        when(Utils.returnIfGuest(
-                        any(UserRepository.class),
-                        any(RegularLight.class),
-                        anyLong(),
-                        any(Principal.class)))
-                .thenAnswer(i -> i.getArguments()[1]);
+        User guest = new User();
+        User host = new User();
+        host.getGuests().add(guest);
+        guest.getHosts().add(host);
+
+        when(userRepository.findById(20L)).thenReturn(Optional.of(host));
+        when(userRepository.findByUsername("user")).thenReturn(guest);
 
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));

From f00850edd92ff521577e428a9873824d1e3ea20f Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 24 May 2020 22:31:32 +0200
Subject: [PATCH 119/176] Fixes

---
 .../DimmableLightControllerTests.java         | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
index c73b9be..cca260e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightControllerTests.java
@@ -11,17 +11,8 @@ import static org.mockito.Mockito.when;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLightRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SceneRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.State;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.StateRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.security.Principal;
 import java.util.Optional;
 import lombok.SneakyThrows;
@@ -115,12 +106,13 @@ public class DimmableLightControllerTests {
         when(deviceService.saveAsGuest(any(DimmableLight.class), eq("user"), anyLong()))
                 .thenAnswer(i -> i.getArguments()[0]);
 
-        when(Utils.returnIfGuest(
-                        any(UserRepository.class),
-                        any(DimmableLight.class),
-                        anyLong(),
-                        any(Principal.class)))
-                .thenAnswer(i -> i.getArguments()[1]);
+        User guest = new User();
+        User host = new User();
+        host.getGuests().add(guest);
+        guest.getHosts().add(host);
+
+        when(userRepository.findById(20L)).thenReturn(Optional.of(host));
+        when(userRepository.findByUsername("user")).thenReturn(guest);
 
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));

From b3f24b7df392c6008b0ca84c4c729768db5c04a6 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Sun, 24 May 2020 22:50:16 +0200
Subject: [PATCH 120/176] added RangeTriggerControllerTests

---
 .../RangeTriggerControllerTests.java          | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerControllerTests.java
new file mode 100644
index 0000000..673b48a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerControllerTests.java
@@ -0,0 +1,105 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.RangeConditionOrTriggerSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("RangeTriggerController tests")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class RangeTriggerControllerTests {
+    @InjectMocks private RangeTriggerController controller;
+
+    @Mock private RangeTriggerRepository repository;
+
+    @Test
+    public void testDelete() {
+        doNothing().when(repository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+
+    @Test
+    public void testGetAll() {
+        RangeTrigger trigger1 = new RangeTrigger();
+        trigger1.setAutomationId(1L);
+        RangeTrigger trigger2 = new RangeTrigger();
+        trigger2.setAutomationId(1L);
+        RangeTrigger trigger3 = new RangeTrigger();
+        trigger3.setAutomationId(1L);
+        ArrayList list = new ArrayList<>();
+        list.add(trigger1);
+        list.add(trigger2);
+        list.add(trigger3);
+        when(repository.findAllByAutomationId(42L)).thenReturn(list);
+        List returned = controller.getAll(42L);
+        assertThat(returned).contains(trigger1);
+        assertThat(returned).contains(trigger2);
+        assertThat(returned).contains(trigger3);
+        assertThat(returned.size()).isEqualTo(3);
+    }
+
+    @Test
+    public void testCreate() {
+        RangeConditionOrTriggerSaveRequest toSend = new RangeConditionOrTriggerSaveRequest();
+        toSend.setRange(40L);
+        toSend.setOperator(Operator.EQUAL);
+        toSend.setDeviceId(1L);
+        toSend.setAutomationId(2L);
+        RangeTrigger trigger = new RangeTrigger();
+        trigger.setRange(40L);
+        trigger.setOperator(Operator.EQUAL);
+        trigger.setAutomationId(2L);
+        trigger.setDeviceId(1L);
+        when(repository.save(any(RangeTrigger.class))).thenReturn(trigger);
+        RangeTrigger returned = controller.create(toSend);
+        assertThat(returned.getOperator()).isEqualTo(toSend.getOperator());
+        assertThat(returned.getRange()).isEqualTo(toSend.getRange());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        RangeTrigger trigger = new RangeTrigger();
+        trigger.setRange(40L);
+        trigger.setDeviceId(1L);
+        trigger.setAutomationId(2L);
+        trigger.setOperator(Operator.EQUAL);
+        when(repository.save(trigger)).thenReturn(trigger);
+        RangeConditionOrTriggerSaveRequest toSend = new RangeConditionOrTriggerSaveRequest();
+        toSend.setId(34L);
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setRange(40L);
+        when(repository.findById(34L)).thenReturn(Optional.of(trigger));
+        RangeTrigger returned = controller.update(toSend);
+        assertThat(returned.getRange()).isEqualTo(toSend.getRange());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getOperator()).isEqualTo(toSend.getOperator());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+}

From fe45151dd14540247db4f05a160c1d73c1534fb2 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 24 May 2020 23:10:16 +0200
Subject: [PATCH 121/176] Fixes

---
 .../BooleanConditionControllerTests.java      | 104 ++++++++++++++++++
 .../BooleanTriggerControllerTests.java        | 104 ++++++++++++++++++
 2 files changed, 208 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionControllerTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionControllerTests.java
new file mode 100644
index 0000000..b38b26c
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanConditionControllerTests.java
@@ -0,0 +1,104 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanConditionOrTriggerSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanConditionRepository;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("BooleanConditionController tests")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class BooleanConditionControllerTests {
+    @InjectMocks private BooleanConditionController controller;
+
+    @Mock private BooleanConditionRepository repository;
+
+    @Mock private Principal principal;
+
+    @Test
+    public void testCreate() {
+        BooleanCondition condition = new BooleanCondition();
+        condition.setOn(true);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        when(repository.save(any())).thenAnswer(i -> i.getArgument(0));
+        BooleanConditionOrTriggerSaveRequest toSend = new BooleanConditionOrTriggerSaveRequest();
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOn(false);
+        BooleanCondition returned = controller.create(toSend);
+        assertThat(returned.isOn()).isEqualTo(toSend.isOn());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        BooleanCondition condition = new BooleanCondition();
+        condition.setOn(true);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        when(repository.save(condition)).thenReturn(condition);
+        BooleanConditionOrTriggerSaveRequest toSend = new BooleanConditionOrTriggerSaveRequest();
+        toSend.setId(34L);
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOn(false);
+        when(repository.findById(34L)).thenReturn(Optional.of(condition));
+        BooleanCondition returned = controller.update(toSend);
+        assertThat(returned.isOn()).isEqualTo(toSend.isOn());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    public void testGetAll() {
+        BooleanCondition condition1 = new BooleanCondition();
+        condition1.setAutomationId(1L);
+        BooleanCondition condition2 = new BooleanCondition();
+        condition2.setAutomationId(1L);
+        BooleanCondition condition3 = new BooleanCondition();
+        condition3.setAutomationId(1L);
+        ArrayList list = new ArrayList<>();
+        list.add(condition1);
+        list.add(condition2);
+        list.add(condition3);
+        when(repository.findAllByAutomationId(42L)).thenReturn(list);
+        List returned = controller.getAll(42L);
+        assertThat(returned).contains(condition1);
+        assertThat(returned).contains(condition2);
+        assertThat(returned).contains(condition3);
+        assertThat(returned.size()).isEqualTo(3);
+    }
+
+    @Test
+    public void testDelete() {
+        doNothing().when(repository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerControllerTests.java
new file mode 100644
index 0000000..ca3c613
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerControllerTests.java
@@ -0,0 +1,104 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.BooleanConditionOrTriggerSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTriggerRepository;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("BooleanTriggerController tests")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class BooleanTriggerControllerTests {
+    @InjectMocks private BooleanTriggerController controller;
+
+    @Mock private BooleanTriggerRepository repository;
+
+    @Mock private Principal principal;
+
+    @Test
+    public void testCreate() {
+        BooleanTrigger condition = new BooleanTrigger();
+        condition.setOn(true);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        when(repository.save(any())).thenAnswer(i -> i.getArgument(0));
+        BooleanConditionOrTriggerSaveRequest toSend = new BooleanConditionOrTriggerSaveRequest();
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOn(false);
+        BooleanTrigger returned = controller.create(toSend);
+        assertThat(returned.isOn()).isEqualTo(toSend.isOn());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        BooleanTrigger condition = new BooleanTrigger();
+        condition.setOn(true);
+        condition.setDeviceId(1L);
+        condition.setAutomationId(2L);
+        when(repository.save(condition)).thenReturn(condition);
+        BooleanConditionOrTriggerSaveRequest toSend = new BooleanConditionOrTriggerSaveRequest();
+        toSend.setId(34L);
+        toSend.setAutomationId(2L);
+        toSend.setDeviceId(1L);
+        toSend.setOn(false);
+        when(repository.findById(34L)).thenReturn(Optional.of(condition));
+        BooleanTrigger returned = controller.update(toSend);
+        assertThat(returned.isOn()).isEqualTo(toSend.isOn());
+        assertThat(returned.getAutomationId()).isEqualTo(toSend.getAutomationId());
+        assertThat(returned.getDeviceId()).isEqualTo(toSend.getDeviceId());
+    }
+
+    @Test
+    public void testGetAll() {
+        BooleanTrigger condition1 = new BooleanTrigger();
+        condition1.setAutomationId(1L);
+        BooleanTrigger condition2 = new BooleanTrigger();
+        condition2.setAutomationId(1L);
+        BooleanTrigger condition3 = new BooleanTrigger();
+        condition3.setAutomationId(1L);
+        ArrayList list = new ArrayList<>();
+        list.add(condition1);
+        list.add(condition2);
+        list.add(condition3);
+        when(repository.findAllByAutomationId(42L)).thenReturn(list);
+        List returned = controller.getAll(42L);
+        assertThat(returned).contains(condition1);
+        assertThat(returned).contains(condition2);
+        assertThat(returned).contains(condition3);
+        assertThat(returned.size()).isEqualTo(3);
+    }
+
+    @Test
+    public void testDelete() {
+        doNothing().when(repository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+}

From 710c7666dddda4ec60ce5e9a8e52ec32247e3c44 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Sun, 24 May 2020 23:42:47 +0200
Subject: [PATCH 122/176] Fixes

---
 .../{model => models}/AutomationTests.java    |  3 +--
 .../BooleanConditionTests.java                |  4 +---
 .../BooleanTriggerTests.java                  |  4 +---
 .../{model => models}/ButtonDimmerTests.java  |  5 +----
 .../{model => models}/ConditionTests.java     |  3 +--
 .../ConfirmationTokenTests.java               |  4 +---
 .../{model => models}/CurtainsTests.java      |  3 +--
 .../{model => models}/DimmableLightTests.java |  3 +--
 .../{model => models}/DimmableStateTests.java |  4 +---
 .../{model => models}/DimmableTests.java      |  3 +--
 .../{model => models}/DimmerTests.java        |  4 +---
 .../{model => models}/KnobDimmerTests.java    | 11 ++++++----
 .../{model => models}/MotionSensorTests.java  |  4 ++--
 .../smarthut/models/OperatorTests.java        | 21 +++++++++++++++++++
 .../RangeConditionTests.java                  |  5 +----
 .../{model => models}/RangeTriggerTests.java  |  5 +----
 .../{model => models}/RegularLightTests.java  |  3 +--
 .../smarthut/{model => models}/RoomTests.java |  6 +-----
 .../{model => models}/ScenePriorityTests.java |  3 +--
 .../{model => models}/SceneTests.java         |  3 +--
 .../SecurityCameraTests.java                  |  3 +--
 .../{model => models}/SensorTests.java        |  5 ++---
 .../{model => models}/SmartPlugTests.java     |  3 +--
 .../{model => models}/StateTests.java         |  5 +----
 .../{model => models}/SwitchTests.java        |  3 +--
 .../SwitchableStateTests.java                 |  3 +--
 .../ThermostatConditionTests.java             | 12 ++++++++---
 .../{model => models}/ThermostatTests.java    |  3 +--
 .../{model => models}/TriggerTests.java       |  5 +----
 .../smarthut/{model => models}/UserTests.java |  3 +--
 .../smarthut/utils/UtilsTests.java            | 10 +++++++++
 31 files changed, 76 insertions(+), 80 deletions(-)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/AutomationTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/BooleanConditionTests.java (89%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/BooleanTriggerTests.java (88%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/ButtonDimmerTests.java (85%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/ConditionTests.java (88%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/ConfirmationTokenTests.java (90%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/CurtainsTests.java (90%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/DimmableLightTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/DimmableStateTests.java (83%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/DimmableTests.java (95%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/DimmerTests.java (85%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/KnobDimmerTests.java (82%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/MotionSensorTests.java (83%)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OperatorTests.java
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/RangeConditionTests.java (86%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/RangeTriggerTests.java (86%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/RegularLightTests.java (91%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/RoomTests.java (86%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/ScenePriorityTests.java (89%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/SceneTests.java (91%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/SecurityCameraTests.java (89%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/SensorTests.java (85%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/SmartPlugTests.java (89%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/StateTests.java (82%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/SwitchTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/SwitchableStateTests.java (82%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/ThermostatConditionTests.java (82%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/ThermostatTests.java (96%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/TriggerTests.java (86%)
 rename src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/{model => models}/UserTests.java (94%)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationTests.java
index 7c4e7c7..f4d4019 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/AutomationTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/AutomationTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionTests.java
similarity index 89%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionTests.java
index 824a8fb..de37a8f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanConditionTests.java
@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switch;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerTests.java
similarity index 88%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerTests.java
index a1fc6e7..9f4bfb0 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/BooleanTriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerTests.java
@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Switch;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmerTests.java
similarity index 85%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmerTests.java
index 7aab4ce..c5a9fc4 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ButtonDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmerTests.java
@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ButtonDimmer;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionTests.java
similarity index 88%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionTests.java
index b676b28..be5c7ba 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConditionTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanCondition;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
similarity index 90%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
index 5503552..4ae4c72 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ConfirmationTokenTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
@@ -1,9 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationToken;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import java.util.Date;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/CurtainsTests.java
similarity index 90%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/CurtainsTests.java
index c366510..a0303cf 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/CurtainsTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/CurtainsTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Curtains;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLightTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLightTests.java
index a72b16e..830abbd 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableLightTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLightTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java
similarity index 83%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java
index 9b58d94..dac93e1 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java
@@ -1,9 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableTests.java
similarity index 95%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableTests.java
index a50d2cb..b720a3c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmableTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmerTests.java
similarity index 85%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmerTests.java
index 6dfc46c..5c473e6 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/DimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmerTests.java
@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmerTests.java
similarity index 82%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmerTests.java
index def3f7f..d7b8b34 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/KnobDimmerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmerTests.java
@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -44,4 +41,10 @@ public class KnobDimmerTests {
             }
         }
     }
+
+    @Test
+    public void testReadTriggerState() {
+        this.knobDimmer.setLightIntensity(1);
+        assertEquals(1, this.knobDimmer.readTriggerState());
+    }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensorTests.java
similarity index 83%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensorTests.java
index 9c4d9ac..60e09cb 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/MotionSensorTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensorTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -22,5 +21,6 @@ public class MotionSensorTests {
     public void setAndGetDetected() {
         this.motionSensor.setDetected(true);
         assertTrue(this.motionSensor.isDetected());
+        assertTrue(this.motionSensor.readTriggerState());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OperatorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OperatorTests.java
new file mode 100644
index 0000000..197e36a
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/OperatorTests.java
@@ -0,0 +1,21 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class OperatorTests {
+    @Test
+    public void testOperators() {
+        assertThat(Operator.EQUAL.checkAgainst(30, 30)).isTrue();
+        assertThat(Operator.EQUAL.checkAgainst(20, 30)).isFalse();
+        assertThat(Operator.LESS.checkAgainst(20, 30)).isTrue();
+        assertThat(Operator.LESS.checkAgainst(40, 30)).isFalse();
+        assertThat(Operator.LESS_EQUAL.checkAgainst(30, 30)).isTrue();
+        assertThat(Operator.LESS_EQUAL.checkAgainst(40, 30)).isFalse();
+        assertThat(Operator.GREATER.checkAgainst(40, 30)).isTrue();
+        assertThat(Operator.GREATER.checkAgainst(30, 30)).isFalse();
+        assertThat(Operator.GREATER_EQUAL.checkAgainst(30, 30)).isTrue();
+        assertThat(Operator.GREATER_EQUAL.checkAgainst(20, 30)).isFalse();
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionTests.java
similarity index 86%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionTests.java
index d963fda..91b5bab 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeConditionTests.java
@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeCondition;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerTests.java
similarity index 86%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerTests.java
index 27a5623..df38df5 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RangeTriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerTests.java
@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Operator;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RangeTrigger;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLightTests.java
similarity index 91%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLightTests.java
index 97a66b4..9777cc8 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RegularLightTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLightTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RoomTests.java
similarity index 86%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RoomTests.java
index 538806f..1b0724d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/RoomTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RoomTests.java
@@ -1,11 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Icon;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Room;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
similarity index 89%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
index b2309b4..a01c5d5 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ScenePriorityTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneTests.java
similarity index 91%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneTests.java
index a72557c..0e7dad9 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SceneTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SceneTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCameraTests.java
similarity index 89%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCameraTests.java
index 1fc45fc..b02900c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SecurityCameraTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCameraTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SecurityCamera;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java
similarity index 85%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java
index f9c49ad..0aa1089 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SensorTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor.SensorType;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +31,7 @@ public class SensorTests {
     public void getAndSetValue() {
         sensor.setValue(new BigDecimal(40));
 
-        assertEquals(new BigDecimal(40), sensor.getValue());
+        assertEquals(40.0, sensor.readTriggerState());
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlugTests.java
similarity index 89%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlugTests.java
index 046a2d2..c8fe22b 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SmartPlugTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlugTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SmartPlug;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java
similarity index 82%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java
index 7b1e513..4b4224d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/StateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java
@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableState;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Scene;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java
index 3358b84..c83bd5f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java
@@ -1,9 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java
similarity index 82%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java
index c9be074..8fcd326 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/SwitchableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SwitchableState;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionTests.java
similarity index 82%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionTests.java
index 3e3de78..182867f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatConditionTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatConditionTests.java
@@ -1,10 +1,8 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat.Mode;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatCondition.Operator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -49,5 +47,13 @@ public class ThermostatConditionTests {
 
         thermostatCondition.setOperator(Operator.NOTEQUAL);
         assertFalse(thermostatCondition.triggered());
+
+        t.setMode(Mode.COOLING);
+
+        thermostatCondition.setOperator(Operator.EQUAL);
+        assertFalse(thermostatCondition.triggered());
+
+        thermostatCondition.setOperator(Operator.NOTEQUAL);
+        assertTrue(thermostatCondition.triggered());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java
similarity index 96%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java
index c708c93..e189131 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/ThermostatTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java
similarity index 86%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java
index ca8dec0..643242a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/TriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java
@@ -1,10 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Automation;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.BooleanTrigger;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.RegularLight;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserTests.java
similarity index 94%
rename from src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java
rename to src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserTests.java
index 9a4c1e0..c93cd9d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/model/UserTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/UserTests.java
@@ -1,8 +1,7 @@
-package ch.usi.inf.sa4.sanmarinoes.smarthut.model;
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java
index c5fcc8d..e30eed6 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/utils/UtilsTests.java
@@ -43,5 +43,15 @@ public class UtilsTests {
 
         assertThatThrownBy(() -> Utils.returnIfGuest(userRepository, "toReturn", 2L, principal))
                 .isInstanceOf(NotFoundException.class);
+
+        host.getGuests().clear();
+
+        assertThatThrownBy(
+                        () ->
+                                assertThat(
+                                                Utils.returnIfGuest(
+                                                        userRepository, "toReturn", 1L, principal))
+                                        .isEqualTo("toReturn"))
+                .isInstanceOf(NotFoundException.class);
     }
 }

From 00f2442397802dac26954b2e3f693549c88ad504 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 25 May 2020 00:14:14 +0200
Subject: [PATCH 123/176] Fixes

---
 .../CameraConfigurationServiceTests.java      | 15 ++++++++
 .../smarthut/models/InputDeviceTests.java     | 14 ++++++++
 .../service/JWTUserDetailsServiceTests.java   | 34 +++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationServiceTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/InputDeviceTests.java
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationServiceTests.java
new file mode 100644
index 0000000..69d95dc
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationServiceTests.java
@@ -0,0 +1,15 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class CameraConfigurationServiceTests {
+
+    @Test
+    public void test() {
+        final CameraConfigurationService c = new CameraConfigurationService();
+        c.setVideoUrl("cose");
+        assertThat(c.getVideoUrl()).isEqualTo("cose");
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/InputDeviceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/InputDeviceTests.java
new file mode 100644
index 0000000..269a051
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/InputDeviceTests.java
@@ -0,0 +1,14 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class InputDeviceTests {
+
+    @Test
+    public void test() {
+        final InputDevice motionSensor = new MotionSensor();
+        assertThat(motionSensor.getOutputs()).isEmpty();
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsServiceTests.java
new file mode 100644
index 0000000..684c241
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsServiceTests.java
@@ -0,0 +1,34 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+@ExtendWith({MockitoExtension.class})
+public class JWTUserDetailsServiceTests {
+
+    @InjectMocks private JWTUserDetailsService jwtUserDetailsService;
+
+    @Mock private UserRepository userRepository;
+
+    @Test
+    public void testLoadByUsername() {
+        final User u = new User();
+        u.setUsername("username");
+        u.setPassword("password");
+        when(userRepository.findByUsername("username")).thenReturn(u);
+        assertThatThrownBy(() -> jwtUserDetailsService.loadUserByUsername("username"))
+                .isInstanceOf(UsernameNotFoundException.class);
+        u.setEnabled(true);
+        assertThat(jwtUserDetailsService.loadUserByUsername("username")).isNotNull();
+    }
+}

From ea0361c38426882738fae38d5f554b3e8acd0df4 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 10:40:43 +0200
Subject: [PATCH 124/176] added missing tests in scenePriority

---
 .../smarthut/models/ScenePriorityTests.java   | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
index a01c5d5..574525c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
@@ -1,6 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -39,4 +39,41 @@ public class ScenePriorityTests {
 
         assertEquals(20, scenePriority.getPriority());
     }
+
+    @Test
+    @DisplayName("get and set automation")
+    public void getAndSetAutomation() {
+        Automation a = new Automation();
+        scenePriority.setAutomation(a);
+
+        assertEquals(a, scenePriority.getAutomation());
+    }
+
+    @Test
+    @DisplayName("get and set scene")
+    public void getAndSetScene() {
+        Scene s = new Scene();
+        scenePriority.setScene(s);
+
+        assertEquals(s, scenePriority.getScene());
+    }
+
+    @Test
+    @DisplayName("get and set scene")
+    public void testRemove() {
+        Scene s = new Scene();
+        scenePriority.setScene(s);
+        scenePriority.setSceneId(20L);
+
+        Automation a = new Automation();
+        scenePriority.setAutomation(a);
+        scenePriority.setAutomationId(20L);
+
+        scenePriority.preRemove();
+
+        assertNull(scenePriority.getAutomation());
+        assertNull(scenePriority.getAutomationId());
+        assertNull(scenePriority.getScene());
+        assertNull(scenePriority.getSceneId());
+    }
 }

From 63c4981da7464b24e454c7dad3c04ec2bbdd5d66 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 11:20:52 +0200
Subject: [PATCH 125/176] added scenePriorityControllerTests

---
 .../ScenePriorityControllerTests.java         | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityControllerTests.java
new file mode 100644
index 0000000..bf854f8
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ScenePriorityControllerTests.java
@@ -0,0 +1,107 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.ScenePrioritySaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriority;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ScenePriorityRepository;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class ScenePriorityControllerTests {
+
+    @InjectMocks private ScenePriorityController scenePriorityController;
+
+    @Mock private ScenePriorityRepository scenePriorityRepository;
+
+    @Test
+    @DisplayName("test for get all should return empty")
+    public void testGetAll() throws NotFoundException {
+        when(scenePriorityRepository.findAllByAutomationId(anyLong())).thenReturn(List.of());
+        assertThat(scenePriorityController.getByAutomationId(20)).isEmpty();
+    }
+
+    private void checkScenePriorityAgainstRequest(
+            final ScenePriority toCheck, final ScenePrioritySaveRequest request) {
+        assertThat(toCheck).isNotNull();
+        assertThat(toCheck.getAutomationId()).isEqualTo(request.getAutomationId());
+        assertThat(toCheck.getPriority()).isEqualTo(request.getPriority());
+        assertThat(toCheck.getSceneId()).isEqualTo(request.getSceneId());
+    }
+
+    @Test
+    @DisplayName("Test for create")
+    public void create() {
+
+        ScenePrioritySaveRequest saveRequest = new ScenePrioritySaveRequest();
+        saveRequest.setAutomationId(20L);
+        saveRequest.setPriority(40);
+        saveRequest.setSceneId(10L);
+
+        when(scenePriorityRepository.save(any(ScenePriority.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        ScenePriority scenePriority = scenePriorityController.create(saveRequest);
+
+        checkScenePriorityAgainstRequest(scenePriority, saveRequest);
+    }
+
+    @Test
+    @DisplayName("Test for update")
+    @SneakyThrows(NotFoundException.class)
+    public void update() {
+
+        ScenePrioritySaveRequest saveRequest = new ScenePrioritySaveRequest();
+        saveRequest.setAutomationId(20L);
+        saveRequest.setPriority(40);
+        saveRequest.setSceneId(10L);
+
+        ScenePriority toUpdate = new ScenePriority();
+
+        when(scenePriorityRepository.findById(anyLong()))
+                .thenReturn(java.util.Optional.of(toUpdate));
+        when(scenePriorityRepository.save(any(ScenePriority.class)))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        ScenePriority scenePriority = scenePriorityController.update(saveRequest);
+
+        checkScenePriorityAgainstRequest(scenePriority, saveRequest);
+    }
+
+    @Test
+    @DisplayName("an existing id should succeed")
+    public void testDelete() {
+
+        doNothing().when(scenePriorityRepository).deleteBySceneId(eq(42L));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        Assertions.assertDoesNotThrow(() -> scenePriorityController.delete(42L));
+    }
+}

From 48942ee8c238bc3f982ca5302a76bfef4e8d67c5 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 25 May 2020 11:27:34 +0200
Subject: [PATCH 126/176] Fixes

---
 .../controller/GuestEnabledController.java    |  4 +--
 .../controller/RegularLightController.java    |  8 +++---
 .../RegularLightControllerTests.java          | 24 ++++++++++++------
 .../controller/SensorControllerTests.java     | 25 +++++++++++++++++++
 .../smarthut/models/SwitchTests.java          | 15 ++++++++---
 5 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java
index 6336a4e..9a06af0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/GuestEnabledController.java
@@ -10,8 +10,8 @@ import java.security.Principal;
 
 public abstract class GuestEnabledController {
 
-    private UserRepository userRepository;
-    private DeviceRepository deviceRepository;
+    private final UserRepository userRepository;
+    private final DeviceRepository deviceRepository;
 
     public GuestEnabledController(
             final UserRepository userRepository, final DeviceRepository deviceRepository) {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
index 29364a1..7cd8225 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
@@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/regularLight")
 public class RegularLightController extends GuestEnabledController {
 
-    private RegularLightRepository regularLightRepository;
-    private SceneRepository sceneRepository;
-    private StateRepository stateRepository;
-    private DeviceService deviceService;
+    private final RegularLightRepository regularLightRepository;
+    private final SceneRepository sceneRepository;
+    private final StateRepository stateRepository;
+    private final DeviceService deviceService;
 
     @Autowired
     public RegularLightController(
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
index 1e4523f..323c4d2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
@@ -34,18 +35,12 @@ public class RegularLightControllerTests {
 
     @Mock private RegularLightRepository regularLightRepository;
 
-    @Mock private SceneRepository sceneRepository;
-
-    @Mock private StateRepository stateRepository;
-
     @Mock private DeviceService deviceService;
 
     @Mock private Principal mockPrincipal;
 
     @Mock private UserRepository userRepository;
 
-    @Mock private DeviceRepository deviceRepository;
-
     @BeforeEach
     public void setup() {
         when(mockPrincipal.getName()).thenReturn("user");
@@ -86,12 +81,27 @@ public class RegularLightControllerTests {
     public void testUpdate() {
 
         final SwitchableSaveRequest toSend = new SwitchableSaveRequest();
-        toSend.setId(50L);
         toSend.setName("rl");
         toSend.setRoomId(20L);
         toSend.setOn(true);
 
         final RegularLight toUpdate = new RegularLight();
+        toUpdate.setName("OOO");
+        toUpdate.setRoomId(40L);
+        toUpdate.setOn(false);
+
+        when(regularLightRepository.findByIdAndUsername(50L, "user"))
+                .thenReturn(Optional.of(toUpdate));
+        when(regularLightRepository.findByIdAndUsername(60L, "user")).thenReturn(Optional.empty());
+
+        when(deviceService.saveAsOwner(toUpdate, "user")).thenReturn(toUpdate);
+
+        toSend.setId(60L);
+        assertThatThrownBy(() -> regularLightController.update(toSend, mockPrincipal, null))
+                .isInstanceOf(NotFoundException.class);
+        toSend.setId(50L);
+        assertThat(regularLightController.update(toSend, mockPrincipal, null)).isEqualTo(toUpdate);
+
         toUpdate.setName("OOO");
         toUpdate.setRoomId(40L);
         toSend.setId(50L);
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
index a166335..bac53e0 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
@@ -8,9 +9,12 @@ import static org.mockito.Mockito.when;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SensorRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.SensorService;
 import java.math.BigDecimal;
 import java.security.Principal;
+import java.util.Optional;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +39,10 @@ public class SensorControllerTests {
 
     @Mock private Principal mockPrincipal;
 
+    @Mock private SensorRepository sensorRepository;
+
+    @Mock private SensorService sensorService;
+
     @BeforeEach
     public void setup() {
         when(mockPrincipal.getName()).thenReturn("user");
@@ -78,4 +86,21 @@ public class SensorControllerTests {
 
         Assertions.assertDoesNotThrow(() -> sensorController.deleteById(42L, mockPrincipal));
     }
+
+    @Test
+    public void testUpdateValue() throws NotFoundException {
+        final Sensor s = new Sensor();
+        when(sensorRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(s));
+        when(sensorRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
+        when(sensorService.updateValueFromSensor(s, BigDecimal.valueOf(30)))
+                .thenAnswer(
+                        i -> {
+                            s.setValue(i.getArgument(1));
+                            return s;
+                        });
+        assertThatThrownBy(() -> sensorController.updateValue(2L, BigDecimal.ZERO, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+        assertThat(sensorController.updateValue(1L, BigDecimal.valueOf(30), mockPrincipal))
+                .isSameAs(s);
+    }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java
index c83bd5f..46fd574 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchTests.java
@@ -1,5 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -10,7 +11,8 @@ import org.junit.jupiter.api.Test;
 @DisplayName("A switch")
 public class SwitchTests {
 
-    Switch aSwitch;
+    private Switch aSwitch;
+    private SmartPlug smartPlug;
 
     @BeforeEach
     public void createNewSwitch() {
@@ -18,10 +20,11 @@ public class SwitchTests {
         this.aSwitch = new Switch();
         RegularLight regularLight = new RegularLight();
         DimmableLight dimmableLight = new DimmableLight();
-        SmartPlug smartPlug = new SmartPlug();
+        smartPlug = new SmartPlug();
         this.aSwitch.getSwitchables().add(regularLight);
         this.aSwitch.getSwitchables().add(dimmableLight);
-        this.aSwitch.getSwitchables().add(smartPlug);
+        this.aSwitch.connect(smartPlug, true);
+        assertThat(this.aSwitch.getOutputs()).containsAll(this.aSwitch.getSwitchables());
     }
 
     @Test
@@ -93,4 +96,10 @@ public class SwitchTests {
             assertFalse(s.isOn());
         }
     }
+
+    @Test
+    public void testDisconnect() {
+        this.aSwitch.connect(smartPlug, false);
+        assertFalse(this.aSwitch.getOutputs().contains(smartPlug));
+    }
 }

From 3fec9ccd200ffe0c67a7f556da8cac6d64378fc1 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 11:33:35 +0200
Subject: [PATCH 127/176] added missing tests

---
 .../RegularLightControllerTests.java          | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
index 323c4d2..b96e6e7 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
@@ -9,12 +9,14 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.DuplicateStateException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.Optional;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -41,6 +43,10 @@ public class RegularLightControllerTests {
 
     @Mock private UserRepository userRepository;
 
+    @Mock private SceneRepository sceneRepository;
+
+    @Mock private StateRepository stateRepository;
+
     @BeforeEach
     public void setup() {
         when(mockPrincipal.getName()).thenReturn("user");
@@ -128,4 +134,50 @@ public class RegularLightControllerTests {
 
         checkRegularLightAgainstRequest(regularLight, toSend);
     }
+
+    @Test
+    @DisplayName("an existing id should succeed")
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        Assertions.assertDoesNotThrow(() -> regularLightController.delete(42L, mockPrincipal));
+    }
+
+    @Test
+    public void testSceneBinding() {
+        RegularLight regularLight = new RegularLight();
+        when(regularLightRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(regularLight));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = regularLight.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(0);
+        Assertions.assertDoesNotThrow(
+                () -> regularLightController.sceneBinding(24L, 1L, mockPrincipal));
+    }
+
+    @Test
+    public void testSceneBinding2() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        RegularLight regularLight = new RegularLight();
+        when(regularLightRepository.findByIdAndUsername(24L, "user"))
+                .thenReturn(Optional.of(regularLight));
+        Scene scene = new Scene();
+        scene.setId(1L);
+        SwitchableState state = new SwitchableState();
+        state.setSceneId(1L);
+        State s = regularLight.cloneState();
+        when(sceneRepository.findById(1L)).thenReturn(Optional.of(scene));
+        when(stateRepository.countByDeviceIdAndSceneId(24L, 1L)).thenReturn(2);
+        assertThatThrownBy(() -> regularLightController.sceneBinding(24L, 1L, mockPrincipal))
+                .isInstanceOf(DuplicateStateException.class);
+    }
 }

From ef2247e38a3a57fdba6876ee9a1a098d238b83fb Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 25 May 2020 11:57:01 +0200
Subject: [PATCH 128/176] Tests

---
 .../smarthut/models/SwitchableStateTests.java         |  6 ++++++
 .../smarthut/service/ThermostatServiceTests.java      | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java
index 8fcd326..7ad5998 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchableStateTests.java
@@ -14,6 +14,7 @@ public class SwitchableStateTests {
     @BeforeEach
     public void createSwitchableState() {
         switchableState = new SwitchableState();
+        switchableState.setDevice(new RegularLight());
     }
 
     @Test
@@ -22,5 +23,10 @@ public class SwitchableStateTests {
         switchableState.setOn(true);
 
         assertTrue(switchableState.isOn());
+
+        switchableState.apply();
+        assertTrue(((Switchable) switchableState.getDevice()).isOn());
+
+        assertTrue(switchableState.copy().isOn());
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java
index 05a0447..978b157 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatServiceTests.java
@@ -10,6 +10,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -63,4 +64,14 @@ public class ThermostatServiceTests {
         when(thermostatRepository.findAllByUsername("user")).thenReturn(List.of(t));
         assertThat(thermostatService.findAll("user")).containsExactly(t);
     }
+
+    @Test
+    public void testFindById() {
+        final Thermostat t = new Thermostat();
+        when(thermostatRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
+        when(thermostatRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(t));
+        doNothing().when(thermostatPopulationService).populateMeasuredTemperature(t);
+        assertThat(thermostatService.findById(2L, "user")).isEmpty();
+        assertThat(thermostatService.findById(1L, "user")).isNotEmpty();
+    }
 }

From 9e98670ce96ab752a22d94409ba6ba05334240e5 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Mon, 25 May 2020 12:13:32 +0200
Subject: [PATCH 129/176] Tests

---
 .../inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java
index 643242a..adef575 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/TriggerTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -58,4 +59,11 @@ public class TriggerTests {
         booleanTrigger.setAutomationId(20L);
         assertEquals(20, booleanTrigger.getAutomationId());
     }
+
+    @Test
+    public void testRemove() {
+        booleanTrigger.setDeviceId(30L);
+        booleanTrigger.removeDeviceAndScene();
+        assertNull(booleanTrigger.getDeviceId());
+    }
 }

From a3b606088c32287c1ba4a2bdffe93d6c9d593117 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 14:06:49 +0200
Subject: [PATCH 130/176] dimmable state

---
 .../sanmarinoes/smarthut/models/DimmableStateTests.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java
index dac93e1..11ce6b2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableStateTests.java
@@ -33,4 +33,13 @@ public class DimmableStateTests {
         this.dimmableState.apply();
         assertEquals(30, d.getIntensity());
     }
+
+    @Test
+    @DisplayName("apply")
+    public void copy() {
+        this.dimmableState.setIntensity(30);
+
+        DimmableState copy = this.dimmableState.copy();
+        assertEquals(30, copy.getIntensity());
+    }
 }

From 96166382451acc259a8182ad8d9ae815dba71b0a Mon Sep 17 00:00:00 2001
From: britea 
Date: Mon, 25 May 2020 14:23:23 +0200
Subject: [PATCH 131/176] motion sensor tests

---
 .../dto/GenericDeviceSaveRequest.java         |   5 +
 .../MotionSensorControllerTests.java          | 111 ++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveRequest.java
index fc8454a..d550a8d 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/GenericDeviceSaveRequest.java
@@ -1,9 +1,14 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.dto;
 
 import javax.validation.constraints.NotNull;
+
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class GenericDeviceSaveRequest {
     /**
      * The room this device belongs in, as a foreign key id. To use when updating and inserting from
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
new file mode 100644
index 0000000..04a6d1e
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
@@ -0,0 +1,111 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.CurtainsRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensorRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.math.BigDecimal;
+import java.security.Principal;
+import java.util.Optional;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.MotionSensorService;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@DisplayName("The motion sensor controller")
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class MotionSensorControllerTests {
+    @InjectMocks private MotionSensorController motionSensorController;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private MotionSensorService motionSensorService;
+
+    @Mock private MotionSensorRepository motionSensorRepository;
+
+
+    @Mock private Principal mockPrincipal;
+
+    @BeforeEach
+    public void setup() {
+        when(mockPrincipal.getName()).thenReturn("user");
+    }
+
+    private void checkMotionSensorAgainstRequest(final MotionSensor toCheck, final GenericDeviceSaveRequest request) {
+        assertThat(toCheck).isNotNull();
+        assertThat(toCheck.getName()).isEqualTo(request.getName());
+        assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
+    }
+
+    @DisplayName("when creating should return the same object")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testCreate() {
+        doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
+        when(deviceService.saveAsOwner(any(MotionSensor.class), eq("user")))
+                .thenAnswer(i -> i.getArguments()[0]);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        final GenericDeviceSaveRequest toSend =
+                new GenericDeviceSaveRequest(42L, "Test sensor");
+        final MotionSensor created = motionSensorController.create(toSend, mockPrincipal);
+
+        checkMotionSensorAgainstRequest(created, toSend);
+    }
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(motionSensorService.updateDetectionFromMotionSensor(any(MotionSensor.class), eq(true), eq("user"))).thenAnswer(i -> i.getArguments()[0]);
+        MotionSensor motionSensor = new MotionSensor();
+        motionSensor.setId(1L);
+        motionSensor.setName("name");
+        motionSensor.setRoomId(42L);
+        when(deviceService.saveAsOwner(any(MotionSensor.class), eq("user"))).thenReturn(motionSensor);
+        GenericDeviceSaveRequest toSend = new GenericDeviceSaveRequest();
+        toSend.setRoomId(42L);
+        toSend.setName("name");
+        when(motionSensorRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(motionSensor));
+        MotionSensor returned = motionSensorController.updateDetection(1L, false, mockPrincipal);
+        assertThat(returned.getRoomId()).isEqualTo(toSend.getRoomId());
+        assertThat(returned.getName()).isEqualTo(toSend.getName());
+        assertFalse(returned.isDetected());
+    }
+
+    @DisplayName("when deleting an existing id should succeed")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testDelete() {
+        doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
+        Assertions.assertDoesNotThrow(() -> motionSensorController.delete(42L, mockPrincipal));
+    }
+}

From c1a199419243466400edc40233183f17b2838c21 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 14:34:33 +0200
Subject: [PATCH 132/176] state

---
 .../smarthut/models/StateTests.java           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java
index 4b4224d..fa88ef2 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/StateTests.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -45,4 +46,44 @@ public class StateTests {
         this.state.setSceneId(50L);
         assertEquals(50, this.state.getSceneId());
     }
+
+    @Test
+    @DisplayName("copy to scene id")
+    public void copyToSceneId() {
+        this.state.setSceneId(50L);
+        Scene s = new Scene();
+        this.state.setScene(s);
+
+        this.state.setDeviceId(30L);
+        DimmableLight d = new DimmableLight();
+        this.state.setDevice(d);
+
+        State stat = this.state.copyToSceneId(10L);
+
+        assertEquals(10, stat.getSceneId());
+        assertEquals(30, stat.getDeviceId());
+
+        assertEquals(s, stat.getScene());
+        assertEquals(d, stat.getDevice());
+    }
+
+    @Test
+    @DisplayName("preremove")
+    public void preRemove() {
+        this.state.setSceneId(50L);
+        Scene s = new Scene();
+        this.state.setScene(s);
+
+        this.state.setDeviceId(30L);
+        DimmableLight d = new DimmableLight();
+        this.state.setDevice(d);
+
+        state.removeDeviceAndScene();
+
+        assertNull(state.getSceneId());
+        assertNull(state.getDeviceId());
+
+        assertNull(state.getScene());
+        assertNull(state.getDevice());
+    }
 }

From 7cdbb191261dfb677cc678865683a71e96049a21 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 14:37:20 +0200
Subject: [PATCH 133/176] scene priority

---
 .../sa4/sanmarinoes/smarthut/models/ScenePriority.java    | 4 ++++
 .../sanmarinoes/smarthut/models/ScenePriorityTests.java   | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
index d6f7ef5..22b6f8f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java
@@ -38,6 +38,10 @@ public class ScenePriority {
         return id;
     }
 
+    public void setId(long id) {
+        this.id = id;
+    }
+
     public Integer getPriority() {
         return priority;
     }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
index 574525c..04e2131 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriorityTests.java
@@ -24,6 +24,14 @@ public class ScenePriorityTests {
         assertEquals(20, scenePriority.getAutomationId());
     }
 
+    @Test
+    @DisplayName("get and set id")
+    public void getAndSetId() {
+        scenePriority.setId(20L);
+
+        assertEquals(20, scenePriority.getId());
+    }
+
     @Test
     @DisplayName("get and set scene id")
     public void getAndSetSceneId() {

From 66422158f638d551212213daedf278ab73b6fa4f Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 14:56:09 +0200
Subject: [PATCH 134/176] regular light controller

---
 .../RegularLightControllerTests.java          | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
index b96e6e7..8d9e548 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
@@ -14,10 +14,10 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
+import java.util.List;
 import java.util.Optional;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -47,11 +47,6 @@ public class RegularLightControllerTests {
 
     @Mock private StateRepository stateRepository;
 
-    @BeforeEach
-    public void setup() {
-        when(mockPrincipal.getName()).thenReturn("user");
-    }
-
     private void checkRegularLightAgainstRequest(
             final RegularLight toCheck, final SwitchableSaveRequest request) {
         assertThat(toCheck).isNotNull();
@@ -60,10 +55,28 @@ public class RegularLightControllerTests {
         assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
     }
 
+    @Test
+    public void testGetAll() {
+        when(regularLightRepository.findAll()).thenReturn(List.of());
+        assertThat(regularLightController.findAll().isEmpty());
+    }
+
+    @Test
+    public void testGet() throws NotFoundException {
+        RegularLight r = new RegularLight();
+        when(regularLightRepository.findById(1L)).thenReturn(Optional.of(r));
+        when(regularLightRepository.findById(2L)).thenReturn(Optional.empty());
+
+        assertThat(regularLightController.findById(1L)).isSameAs(r);
+        assertThatThrownBy(() -> regularLightController.findById(2L))
+                .isInstanceOf(NotFoundException.class);
+    }
+
     @Test
     @DisplayName("when creating should return the same object")
     @SneakyThrows(NotFoundException.class)
     public void testCreate() {
+        when(mockPrincipal.getName()).thenReturn("user");
         doNothing().when(deviceService).throwIfRoomNotOwned(anyLong(), eq("user"));
         when(deviceService.saveAsOwner(any(RegularLight.class), eq("user")))
                 .thenAnswer(i -> i.getArguments()[0]);
@@ -86,6 +99,7 @@ public class RegularLightControllerTests {
     @SneakyThrows(NotFoundException.class)
     public void testUpdate() {
 
+        when(mockPrincipal.getName()).thenReturn("user");
         final SwitchableSaveRequest toSend = new SwitchableSaveRequest();
         toSend.setName("rl");
         toSend.setRoomId(20L);
@@ -140,6 +154,7 @@ public class RegularLightControllerTests {
     @SneakyThrows(NotFoundException.class)
     public void testDelete() {
 
+        when(mockPrincipal.getName()).thenReturn("user");
         doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
 
         MockHttpServletRequest request = new MockHttpServletRequest();
@@ -150,6 +165,7 @@ public class RegularLightControllerTests {
 
     @Test
     public void testSceneBinding() {
+        when(mockPrincipal.getName()).thenReturn("user");
         RegularLight regularLight = new RegularLight();
         when(regularLightRepository.findByIdAndUsername(24L, "user"))
                 .thenReturn(Optional.of(regularLight));
@@ -166,6 +182,7 @@ public class RegularLightControllerTests {
 
     @Test
     public void testSceneBinding2() {
+        when(mockPrincipal.getName()).thenReturn("user");
         when(mockPrincipal.getName()).thenReturn("user");
         RegularLight regularLight = new RegularLight();
         when(regularLightRepository.findByIdAndUsername(24L, "user"))

From 4250f07fef384b090ee03dab527e25f927eec35d Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 25 May 2020 15:47:19 +0200
Subject: [PATCH 135/176] added DimmableStateControllerTests

---
 .../DimmableStateControllerTests.java         | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateControllerTests.java
new file mode 100644
index 0000000..2e90862
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableStateControllerTests.java
@@ -0,0 +1,53 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DimmableStateSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("DimmableState controller test")
+public class DimmableStateControllerTests {
+
+    @InjectMocks DimmableStateController controller;
+
+    @Mock private DimmableStateRepository dimmableStateRepository;
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        DimmableState state = new DimmableState();
+        state.setIntensity(40);
+        DimmableStateSaveRequest toSend = new DimmableStateSaveRequest();
+        toSend.setIntensity(40);
+        toSend.setId(0L);
+        when(dimmableStateRepository.findById(toSend.getId())).thenReturn(Optional.of(state));
+        assertThat(controller.update(toSend).getIntensity()).isEqualTo(toSend.getIntensity());
+    }
+
+    @Test
+    public void testDelete() {
+        doNothing().when(dimmableStateRepository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+}

From a4ca37e6ec94f318037a9f8389e3b0079e4c4bcc Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 25 May 2020 15:55:39 +0200
Subject: [PATCH 136/176] added SwitchableStateControllerTests

---
 .../SwitchableStateControllerTests.java       | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateControllerTests.java
new file mode 100644
index 0000000..384d933
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchableStateControllerTests.java
@@ -0,0 +1,52 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SwitchableStateSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("SwitchableState controller test")
+public class SwitchableStateControllerTests {
+    @InjectMocks private SwitchableStateController controller;
+
+    @Mock private SwitchableStateRepository repository;
+
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void testUpdate() {
+        SwitchableState state = new SwitchableState();
+        state.setOn(true);
+        SwitchableStateSaveRequest toSend = new SwitchableStateSaveRequest();
+        toSend.setOn(true);
+        toSend.setId(0L);
+        when(repository.findById(toSend.getId())).thenReturn(Optional.of(state));
+        assertThat(controller.update(toSend).isOn()).isEqualTo(toSend.isOn());
+    }
+
+    @Test
+    public void testDelete() {
+        doNothing().when(repository).deleteById(eq(42L));
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+        Assertions.assertDoesNotThrow(() -> controller.delete(42L));
+    }
+}

From 82900b1d02defcd3c397a2b8bc2665d15ed75316 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 25 May 2020 16:19:27 +0200
Subject: [PATCH 137/176] added AutomationServiceTests

---
 .../service/AutomationServiceTests.java       | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java
new file mode 100644
index 0000000..2cf74db
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java
@@ -0,0 +1,74 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.ArrayList;
+import java.util.Optional;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("SwitchableState controller test")
+public class AutomationServiceTests {
+    @InjectMocks private AutomationService service;
+
+    @Mock private TriggerRepository repository;
+
+    @Mock private AutomationRepository automationRepository;
+
+    @Mock private ConditionRepository conditionRepository;
+
+    @Test
+    public void testFindTriggerByDeviceId() {
+        RangeTrigger trigger1 = new RangeTrigger();
+        RangeTrigger trigger2 = new RangeTrigger();
+        RangeTrigger trigger3 = new RangeTrigger();
+        trigger1.setDeviceId(0L);
+        trigger2.setDeviceId(0L);
+        trigger3.setDeviceId(1L);
+        ArrayList list = new ArrayList<>();
+        list.add(trigger1);
+        list.add(trigger1);
+        ArrayList> toPut = new ArrayList<>();
+        when(repository.findAllByDeviceId(0L)).thenReturn(list);
+        service.findTriggersByDeviceId(0L, toPut);
+        assertThat(toPut.contains(trigger1));
+        assertThat(toPut.contains(trigger2));
+    }
+
+    @Test
+    public void testFindByVerifiedId() {
+        Automation automation = new Automation();
+        automation.setId(0L);
+        when(automationRepository.findById(eq(0L))).thenReturn(Optional.of(automation));
+        Automation returned = service.findByVerifiedId(0L);
+        assertThat(returned).isSameAs(automation);
+    }
+
+    @Test
+    public void testFindAllConditionByAutomationId() {
+        RangeCondition condition1 = new RangeCondition();
+        RangeCondition condition2 = new RangeCondition();
+        RangeCondition condition3 = new RangeCondition();
+        condition1.setAutomationId(1L);
+        condition2.setAutomationId(0L);
+        condition3.setAutomationId(0L);
+        ArrayList list = new ArrayList<>();
+        list.add(condition2);
+        list.add(condition3);
+        ArrayList> toPut = new ArrayList<>();
+        when(conditionRepository.findAllByAutomationId(0L)).thenReturn(list);
+        service.findAllConditionsByAutomationId(0L, toPut);
+        assertThat(toPut).contains(condition2);
+        assertThat(toPut).contains(condition3);
+    }
+}

From e7def27d2267777be9b89dc95dcf2cc8a7b5894c Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 25 May 2020 16:30:31 +0200
Subject: [PATCH 138/176] added ThermostatPopulationServiceTests

---
 .../service/AutomationServiceTests.java       |  2 +-
 .../ThermostatPopulationServiceTests.java     | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java
index 2cf74db..6d1850f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationServiceTests.java
@@ -17,7 +17,7 @@ import org.springframework.security.test.context.support.WithMockUser;
 
 @ExtendWith(MockitoExtension.class)
 @WithMockUser(username = "user")
-@DisplayName("SwitchableState controller test")
+@DisplayName("AutomationService test")
 public class AutomationServiceTests {
     @InjectMocks private AutomationService service;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationServiceTests.java
new file mode 100644
index 0000000..a48b59b
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationServiceTests.java
@@ -0,0 +1,46 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.math.BigDecimal;
+import java.util.Optional;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("ThermostatPopulationService test")
+public class ThermostatPopulationServiceTests {
+    @InjectMocks private ThermostatPopulationService service;
+
+    @Mock ThermostatRepository repository;
+
+    @Test
+    public void testPopulateMeasuredTemperatureIf() {
+        Thermostat thermostat = new Thermostat();
+        thermostat.setRoomId(0L);
+        thermostat.setUseExternalSensors(true);
+        when(repository.getAverageTemperature(
+                        thermostat.getRoomId(), Sensor.SensorType.TEMPERATURE))
+                .thenReturn(Optional.of(new BigDecimal(17)));
+        service.populateMeasuredTemperature(thermostat);
+        assertThat(thermostat.getMeasuredTemperature()).isEqualTo(new BigDecimal(17));
+    }
+
+    @Test
+    public void testPopulateMeasuredTemperatureElse() {
+        Thermostat thermostat = new Thermostat();
+        thermostat.setRoomId(0L);
+        thermostat.setUseExternalSensors(false);
+        thermostat.setInternalSensorTemperature(new BigDecimal(19));
+        service.populateMeasuredTemperature(thermostat);
+        assertThat(thermostat.getMeasuredTemperature()).isEqualTo(new BigDecimal(19));
+    }
+}

From cffeeca9f845357daae6670a57b981bde124bf06 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 25 May 2020 16:47:06 +0200
Subject: [PATCH 139/176] added DevicePopulationServiceTests

---
 .../service/DevicePopulationServiceTests.java | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java
new file mode 100644
index 0000000..693d11b
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java
@@ -0,0 +1,42 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("DevicePopulationService test")
+public class DevicePopulationServiceTests {
+    @InjectMocks private DevicePopulationService service;
+
+    @Mock private ThermostatPopulationService populationService;
+
+    private void helper(Thermostat t) {
+        t.setMeasuredTemperature(new BigDecimal(1));
+    }
+
+    @Test
+    public void testPopulateComputedFields() {
+        Curtains curtains = new Curtains();
+        RegularLight light = new RegularLight();
+        Thermostat t1 = new Thermostat();
+        RegularLight light2 = new RegularLight();
+        ArrayList list = new ArrayList<>();
+        list.add(curtains);
+        list.add(light);
+        list.add(t1);
+        list.add(light2);
+        doNothing().when(populationService).populateMeasuredTemperature(t1);
+        service.populateComputedFields(list);
+    }
+}

From 49707917925641e0431edb1158a2ce2654c3fdb1 Mon Sep 17 00:00:00 2001
From: Jacob Salvi 
Date: Mon, 25 May 2020 17:31:48 +0200
Subject: [PATCH 140/176] added MotionSensorService tests

---
 .../service/MotionSensorServiceTests.java     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorServiceTests.java
new file mode 100644
index 0000000..12c5451
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorServiceTests.java
@@ -0,0 +1,40 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+@DisplayName("MotionSensorService test")
+public class MotionSensorServiceTests {
+    @InjectMocks private MotionSensorService service;
+
+    @Mock private SensorSocketEndpoint sensorSocketEndpoint;
+    @Mock private DeviceService deviceService;
+    @Mock private MotionSensorRepository motionSensorRepository;
+
+    @Test
+    public void testUpdateDetectionFromMotionSensor() {
+        MotionSensor sensor = new MotionSensor();
+        sensor.setId(1L);
+        User user = new User();
+        user.setId(1L);
+        when(deviceService.saveAsOwner(sensor, "user")).thenReturn(sensor);
+        when(motionSensorRepository.findUser(sensor.getId())).thenReturn(user);
+        doNothing().when(sensorSocketEndpoint).queueDeviceUpdate(sensor, user, false, null, false);
+        MotionSensor returned = service.updateDetectionFromMotionSensor(sensor, true, "user");
+        assertThat(returned).isEqualTo(sensor);
+        assertTrue(returned.isDetected());
+    }
+}

From 82d111613f4fadcdb2a84aff7f37552b25dd8dfa Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 17:48:19 +0200
Subject: [PATCH 141/176] wip

---
 .../MotionSensorControllerTests.java          | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
index 04a6d1e..748bcdf 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
@@ -2,23 +2,19 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SensorSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.CurtainsRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensorRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
-import java.math.BigDecimal;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.MotionSensorService;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.security.Principal;
 import java.util.Optional;
-
-import ch.usi.inf.sa4.sanmarinoes.smarthut.service.MotionSensorService;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -37,6 +33,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 @ExtendWith(MockitoExtension.class)
 @WithMockUser(username = "user")
 public class MotionSensorControllerTests {
+
     @InjectMocks private MotionSensorController motionSensorController;
 
     @Mock private DeviceService deviceService;
@@ -45,6 +42,7 @@ public class MotionSensorControllerTests {
 
     @Mock private MotionSensorRepository motionSensorRepository;
 
+    @Mock private SensorSocketEndpoint sensorSocketEndpoint;
 
     @Mock private Principal mockPrincipal;
 
@@ -53,7 +51,8 @@ public class MotionSensorControllerTests {
         when(mockPrincipal.getName()).thenReturn("user");
     }
 
-    private void checkMotionSensorAgainstRequest(final MotionSensor toCheck, final GenericDeviceSaveRequest request) {
+    private void checkMotionSensorAgainstRequest(
+            final MotionSensor toCheck, final GenericDeviceSaveRequest request) {
         assertThat(toCheck).isNotNull();
         assertThat(toCheck.getName()).isEqualTo(request.getName());
         assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
@@ -70,8 +69,7 @@ public class MotionSensorControllerTests {
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
 
-        final GenericDeviceSaveRequest toSend =
-                new GenericDeviceSaveRequest(42L, "Test sensor");
+        final GenericDeviceSaveRequest toSend = new GenericDeviceSaveRequest(42L, "Test sensor");
         final MotionSensor created = motionSensorController.create(toSend, mockPrincipal);
 
         checkMotionSensorAgainstRequest(created, toSend);
@@ -80,20 +78,29 @@ public class MotionSensorControllerTests {
     @Test
     @SneakyThrows(NotFoundException.class)
     public void testUpdate() {
-        when(mockPrincipal.getName()).thenReturn("user");
-        when(motionSensorService.updateDetectionFromMotionSensor(any(MotionSensor.class), eq(true), eq("user"))).thenAnswer(i -> i.getArguments()[0]);
+
         MotionSensor motionSensor = new MotionSensor();
         motionSensor.setId(1L);
         motionSensor.setName("name");
         motionSensor.setRoomId(42L);
-        when(deviceService.saveAsOwner(any(MotionSensor.class), eq("user"))).thenReturn(motionSensor);
-        GenericDeviceSaveRequest toSend = new GenericDeviceSaveRequest();
-        toSend.setRoomId(42L);
-        toSend.setName("name");
-        when(motionSensorRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(motionSensor));
+        motionSensor.setDetected(true);
+
+        when(motionSensorRepository.findByIdAndUsername(anyLong(), any(String.class)))
+                .thenReturn(Optional.of(motionSensor));
+
+        when(deviceService.saveAsOwner(any(MotionSensor.class), any(String.class)))
+                .thenReturn(motionSensor);
+
+        doNothing()
+                .when(sensorSocketEndpoint)
+                .queueDeviceUpdate(
+                        any(MotionSensor.class), any(User.class), eq(false), eq(null), eq(false));
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
         MotionSensor returned = motionSensorController.updateDetection(1L, false, mockPrincipal);
-        assertThat(returned.getRoomId()).isEqualTo(toSend.getRoomId());
-        assertThat(returned.getName()).isEqualTo(toSend.getName());
+
         assertFalse(returned.isDetected());
     }
 
@@ -101,6 +108,7 @@ public class MotionSensorControllerTests {
     @Test
     @SneakyThrows(NotFoundException.class)
     public void testDelete() {
+
         doNothing().when(deviceService).deleteByIdAsOwner(eq(42L), eq("user"));
 
         MockHttpServletRequest request = new MockHttpServletRequest();

From 2f05253bc15d7115242fd158ecbfbd5ad679679d Mon Sep 17 00:00:00 2001
From: omenem 
Date: Mon, 25 May 2020 18:41:30 +0200
Subject: [PATCH 142/176] implemented user story 1 for sensor

---
 .../smarthut/controller/SensorController.java |  2 ++
 .../smarthut/dto/SensorSaveRequest.java       |  4 +++
 .../sanmarinoes/smarthut/models/Sensor.java   | 27 +++++++++++++++++++
 .../smarthut/service/SensorService.java       | 23 ++++++++++++----
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
index 62581b3..a0b4f82 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
@@ -44,6 +44,8 @@ public class SensorController {
         newSensor.setName(s.getName());
         newSensor.setRoomId(s.getRoomId());
         newSensor.setValue(s.getValue());
+        newSensor.setError(s.getError());
+        newSensor.setTypical(s.getTypical());
 
         return deviceService.saveAsOwner(newSensor, principal.getName());
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
index 59a089a..5ed77c9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
@@ -20,6 +20,10 @@ public class SensorSaveRequest {
 
     @NotNull private BigDecimal value;
 
+    @NotNull private BigDecimal error = new BigDecimal(1);
+
+    private BigDecimal typical;
+
     /**
      * The room this device belongs in, as a foreign key id. To use when updating and inserting from
      * a REST call.
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
index f4d444a..55bb074 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
@@ -44,6 +44,13 @@ public class Sensor extends InputDevice implements RangeTriggerable {
     @Column(nullable = false, precision = 11, scale = 1)
     private BigDecimal value;
 
+    /** The value of the error according to this value */
+    @Column(nullable = false, precision = 11, scale = 1)
+    private BigDecimal err;
+
+    @Column(nullable = true, precision = 11, scale = 1)
+    private BigDecimal typical;
+
     /** The type of this sensor */
     @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
@@ -65,6 +72,26 @@ public class Sensor extends InputDevice implements RangeTriggerable {
         this.value = newValue;
     }
 
+    public BigDecimal getError() {
+        return err;
+    }
+
+    public void setError(BigDecimal err) {
+        this.err = err;
+    }
+
+    public BigDecimal getTypical() {
+        return typical;
+    }
+
+    public void setTypical(BigDecimal typical) {
+        this.typical = typical;
+    }
+
+    public void setTypicalNull() {
+        this.typical = null;
+    }
+
     public Sensor() {
         super("sensor");
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
index 532442b..5029e21 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
@@ -4,6 +4,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SensorRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.math.BigDecimal;
+import java.util.Random;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -19,11 +20,23 @@ public class SensorService {
     @Autowired private SensorSocketEndpoint endpoint;
 
     private void randomJitter(Sensor sensor) {
-        updateValueFromSensor(
-                sensor,
-                Sensor.TYPICAL_VALUES
-                        .get(sensor.getSensor())
-                        .multiply(BigDecimal.valueOf(0.975 + Math.random() / 20)));
+
+        double x;
+        if (sensor.getTypical() == null) {
+            BigDecimal typical = Sensor.TYPICAL_VALUES.get(sensor.getSensor());
+
+            Random ran = new Random();
+            x = (ran.nextInt(typical.intValue()) + sensor.getError().intValue()) * 0.975 + 1;
+
+        } else {
+            Random ran = new Random();
+            x =
+                    (ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue())
+                                    * 0.975
+                            + 1;
+        }
+
+        updateValueFromSensor(sensor, new BigDecimal(x));
     }
 
     public void sensorFakeUpdate() {

From 7d974f1a1de576155a09daa8b29e392819fcdf61 Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Mon, 25 May 2020 21:32:10 +0200
Subject: [PATCH 143/176] device controller is almost tested (can't fix
 exception throw)

---
 .../controller/DeviceControllerTests.java     | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
new file mode 100644
index 0000000..29b11f5
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
@@ -0,0 +1,86 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DeviceSaveRequest;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.BadDataException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
+import java.util.List;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class DeviceControllerTests {
+    @InjectMocks private DeviceController deviceController;
+
+    @Mock private DeviceService deviceService;
+    @Mock private DeviceRepository deviceRepository;
+    @Mock private RoomRepository roomRepository;
+    @Mock private Principal mockPrincipal;
+
+    private User user;
+    private Room room;
+
+    public DeviceControllerTests() {
+        room = new Room();
+        room.setId(1L);
+
+        user = new User();
+        user.setId(1L);
+        user.setName("user");
+    }
+
+    @DisplayName("check update device")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void updateTest() throws BadDataException {
+        DeviceSaveRequest dto = new DeviceSaveRequest();
+        dto.setId(22L);
+        dto.setName("DTO");
+        dto.setRoomId(room.getId());
+        when(mockPrincipal.getName()).thenReturn("user");
+        assertThat(deviceRepository.findByIdAndUsername(34L, mockPrincipal.getName())).isEmpty();
+
+        Device d = new RegularLight();
+        deviceService.saveAsOwner(d, mockPrincipal.getName());
+        d = deviceController.update(dto, mockPrincipal);
+        assertThat(deviceRepository.findByIdAndUsername(dto.getId(), mockPrincipal.getName()))
+                .isSameAs(d);
+        assertThat(d.getRoomId()).isSameAs(dto.getRoomId());
+        assertThat(d.getName()).isSameAs(dto.getName());
+    }
+
+    @DisplayName("check if list is empty")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void getAllEmptyTest() {
+        when(mockPrincipal.getName()).thenReturn("user");
+        List l = deviceController.getAll(user.getId(), mockPrincipal);
+        assertThat(l.isEmpty());
+    }
+
+    @DisplayName("check if list contains elements added")
+    @Test
+    @SneakyThrows(NotFoundException.class)
+    public void getAllTest() throws BadDataException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        Device d1 = new RegularLight();
+        deviceService.saveAsOwner(d1, mockPrincipal.getName());
+        Device d2 = new SmartPlug();
+        deviceService.saveAsOwner(d2, mockPrincipal.getName());
+
+        assertThat(
+                deviceController.getAll(user.getId(), mockPrincipal).containsAll(List.of(d1, d2)));
+    }
+}

From 03ded14ed2e6d9b6ef72021dfa441dc2abca5db9 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 11:24:48 +0200
Subject: [PATCH 144/176] fix (wip)

---
 .../smarthut/controller/SensorControllerTests.java        | 7 ++++++-
 .../sanmarinoes/smarthut/dto/SensorSaveRequestTests.java  | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
index bac53e0..484564f 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -69,7 +69,12 @@ public class SensorControllerTests {
 
         final SensorSaveRequest toSend =
                 new SensorSaveRequest(
-                        Sensor.SensorType.TEMPERATURE, BigDecimal.ZERO, 42L, "Test sensor");
+                        Sensor.SensorType.TEMPERATURE,
+                        BigDecimal.ZERO,
+                        BigDecimal.ZERO,
+                        BigDecimal.ZERO,
+                        42L,
+                        "Test sensor");
         final Sensor created = sensorController.create(toSend, mockPrincipal);
 
         checkSensorAgainstRequest(created, toSend);
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
index 6c99297..2ca98e8 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
@@ -30,7 +30,13 @@ public class SensorSaveRequestTests {
     @DisplayName("test constructor")
     public void testConstructorNotEmpty() {
         SensorSaveRequest newSaveRequest =
-                new SensorSaveRequest(Sensor.SensorType.HUMIDITY, new BigDecimal(12), 12L, "name");
+                new SensorSaveRequest(
+                        Sensor.SensorType.HUMIDITY,
+                        new BigDecimal(12),
+                        BigDecimal.ZERO,
+                        BigDecimal.ZERO,
+                        12L,
+                        "name");
         assertNotNull(newSaveRequest.getSensor());
         assertNotNull(newSaveRequest.getName());
         assertNotNull(newSaveRequest.getRoomId());

From 689e3b96a754aa69ad99aa32d44f6cc8a4a9e457 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 11:40:58 +0200
Subject: [PATCH 145/176] implemented user story 1 for thermmostat, a test is
 not passing

---
 .../controller/ThermostatController.java      |  2 ++
 .../smarthut/dto/ThermostatSaveRequest.java   |  5 ++++
 .../smarthut/models/Thermostat.java           | 23 ++++++++++++++++++
 .../smarthut/service/ThermostatService.java   | 24 +++++++++++++++----
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
index d45ba96..5884a05 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
@@ -30,6 +30,8 @@ public class ThermostatController {
         newT.setRoomId(t.getRoomId());
         newT.setUseExternalSensors(t.isUseExternalSensors());
         newT.setOn(false);
+        newT.setErr(t.getErr());
+        newT.setTypical(newT.getTypical());
 
         thermostatService.populateMeasuredTemperature(newT);
         newT = thermostatRepository.save(newT);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
index 6bbfbb8..ae1f87a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
@@ -26,4 +26,9 @@ public class ThermostatSaveRequest {
 
     /** State of this thermostat */
     @NotNull private boolean turnOn;
+
+    /** The value of the error according to this value */
+    @NotNull private BigDecimal err = new BigDecimal(1);
+
+    private BigDecimal typical;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
index 229f7f6..83ac603 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
@@ -79,6 +79,13 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
 
     @Column private boolean useExternalSensors = false;
 
+    /** The value of the error according to this value */
+    @Column(nullable = false, precision = 11, scale = 1)
+    private BigDecimal err;
+
+    @Column(nullable = true, precision = 11, scale = 1)
+    private BigDecimal typical;
+
     /** Creates a thermostat with a temperature sensor and its initial OFF state */
     public Thermostat() {
         super("thermostat");
@@ -97,6 +104,22 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
         return sb.toString();
     }
 
+    public BigDecimal getErr() {
+        return err;
+    }
+
+    public void setErr(BigDecimal err) {
+        this.err = err;
+    }
+
+    public BigDecimal getTypical() {
+        return typical;
+    }
+
+    public void setTypical(BigDecimal typical) {
+        this.typical = typical;
+    }
+
     public void setMode(Mode state) {
         this.mode = state;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
index 9065826..54ae868 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
@@ -1,6 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor.SensorType;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
@@ -8,6 +9,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
+import java.util.Random;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -35,11 +37,23 @@ public class ThermostatService {
     }
 
     private void randomJitter(Thermostat thermostat) {
-        updateValueForThermostat(
-                thermostat,
-                Sensor.TYPICAL_VALUES
-                        .get(Sensor.SensorType.TEMPERATURE)
-                        .multiply(BigDecimal.valueOf(0.975 + Math.random() / 20)));
+
+        double x;
+        Random ran = new Random();
+        ;
+        if (thermostat.getTypical() == null) {
+            BigDecimal typical = Sensor.TYPICAL_VALUES.get(SensorType.TEMPERATURE);
+
+            x = (ran.nextInt(typical.intValue()) + thermostat.getErr().intValue()) * 0.975 + 1;
+
+        } else {
+            x =
+                    (ran.nextInt(thermostat.getTypical().intValue())
+                                            + thermostat.getErr().intValue())
+                                    * 0.975
+                            + 1;
+        }
+        updateValueForThermostat(thermostat, new BigDecimal(x));
     }
 
     private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) {

From 0046143d82a4eca288a505294feb6c1b526944b5 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 12:05:42 +0200
Subject: [PATCH 146/176] wip

---
 .../smarthut/controller/SensorController.java | 19 +++++++++-
 .../controller/ThermostatController.java      |  8 +++-
 .../smarthut/dto/SensorSaveRequest.java       |  2 +-
 .../smarthut/dto/ThermostatSaveRequest.java   |  2 +-
 .../sanmarinoes/smarthut/models/Sensor.java   |  7 ++--
 .../smarthut/models/Thermostat.java           |  4 +-
 .../smarthut/service/SensorService.java       | 38 ++++++++++---------
 7 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
index a0b4f82..d4accc3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
@@ -44,8 +44,8 @@ public class SensorController {
         newSensor.setName(s.getName());
         newSensor.setRoomId(s.getRoomId());
         newSensor.setValue(s.getValue());
-        newSensor.setError(s.getError());
-        newSensor.setTypical(s.getTypical());
+        //        newSensor.setError(s.getError());
+        //        newSensor.setTypical(s.getTypical());
 
         return deviceService.saveAsOwner(newSensor, principal.getName());
     }
@@ -63,6 +63,21 @@ public class SensorController {
                 value);
     }
 
+    @PutMapping("/{id}/simulation")
+    public Sensor updateSimulation(
+            @PathVariable("id") Long sensorId,
+            @RequestParam("value") BigDecimal error,
+            @RequestParam("value") BigDecimal typical,
+            final Principal principal)
+            throws NotFoundException {
+        return sensorService.updateSimulationFromSensor(
+                sensorRepository
+                        .findByIdAndUsername(sensorId, principal.getName())
+                        .orElseThrow(NotFoundException::new),
+                error,
+                typical);
+    }
+
     @DeleteMapping("/{id}")
     public void deleteById(@PathVariable("id") long id, final Principal principal)
             throws NotFoundException {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
index 5884a05..09b21cf 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
@@ -30,8 +30,12 @@ public class ThermostatController {
         newT.setRoomId(t.getRoomId());
         newT.setUseExternalSensors(t.isUseExternalSensors());
         newT.setOn(false);
-        newT.setErr(t.getErr());
-        newT.setTypical(newT.getTypical());
+        if (t.getErr() != null) {
+            newT.setErr(t.getErr());
+        }
+        if (t.getTypical() != null) {
+            newT.setTypical(t.getTypical());
+        }
 
         thermostatService.populateMeasuredTemperature(newT);
         newT = thermostatRepository.save(newT);
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
index 5ed77c9..f5558c7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
@@ -20,7 +20,7 @@ public class SensorSaveRequest {
 
     @NotNull private BigDecimal value;
 
-    @NotNull private BigDecimal error = new BigDecimal(1);
+    private BigDecimal error;
 
     private BigDecimal typical;
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
index ae1f87a..3734613 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
@@ -28,7 +28,7 @@ public class ThermostatSaveRequest {
     @NotNull private boolean turnOn;
 
     /** The value of the error according to this value */
-    @NotNull private BigDecimal err = new BigDecimal(1);
+    private BigDecimal err;
 
     private BigDecimal typical;
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
index 55bb074..72f863a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
@@ -46,11 +46,10 @@ public class Sensor extends InputDevice implements RangeTriggerable {
 
     /** The value of the error according to this value */
     @Column(nullable = false, precision = 11, scale = 1)
-    private BigDecimal err;
-
-    @Column(nullable = true, precision = 11, scale = 1)
-    private BigDecimal typical;
+    private BigDecimal err = new BigDecimal(1);
 
+    @Column(nullable = false, precision = 11, scale = 1)
+    private BigDecimal typical = new BigDecimal(17);
     /** The type of this sensor */
     @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
index 83ac603..8dcd657 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
@@ -81,10 +81,10 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
 
     /** The value of the error according to this value */
     @Column(nullable = false, precision = 11, scale = 1)
-    private BigDecimal err;
+    private BigDecimal err = new BigDecimal(1);
 
     @Column(nullable = true, precision = 11, scale = 1)
-    private BigDecimal typical;
+    private BigDecimal typical = new BigDecimal(17.0);;
 
     /** Creates a thermostat with a temperature sensor and its initial OFF state */
     public Thermostat() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
index 5029e21..f2d8408 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
@@ -22,20 +22,10 @@ public class SensorService {
     private void randomJitter(Sensor sensor) {
 
         double x;
-        if (sensor.getTypical() == null) {
-            BigDecimal typical = Sensor.TYPICAL_VALUES.get(sensor.getSensor());
-
-            Random ran = new Random();
-            x = (ran.nextInt(typical.intValue()) + sensor.getError().intValue()) * 0.975 + 1;
-
-        } else {
-            Random ran = new Random();
-            x =
-                    (ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue())
-                                    * 0.975
-                            + 1;
-        }
-
+        Random ran = new Random();
+        x =
+                (ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue()) * 0.975
+                        + 1;
         updateValueFromSensor(sensor, new BigDecimal(x));
     }
 
@@ -48,11 +38,9 @@ public class SensorService {
      * Updates the sensor with new measurement and propagates update through websocket
      *
      * @param sensor the sensor to update
-     * @param value the new measurement
      * @return the updated sensor
      */
-    public Sensor updateValueFromSensor(Sensor sensor, BigDecimal value) {
-        sensor.setValue(value);
+    public Sensor update(Sensor sensor) {
         sensor =
                 deviceService.saveAsOwner(
                         sensor, sensorRepository.findUser(sensor.getId()).getUsername());
@@ -60,4 +48,20 @@ public class SensorService {
                 sensor, sensorRepository.findUser(sensor.getId()), false, null, false);
         return sensor;
     }
+
+    public Sensor updateValueFromSensor(Sensor sensor, BigDecimal value) {
+        sensor.setValue(value);
+        return update(sensor);
+    }
+
+    public Sensor updateSimulationFromSensor(Sensor sensor, BigDecimal error, BigDecimal typical) {
+        if (error != null) {
+            sensor.setError(error);
+        }
+
+        if (typical != null) {
+            sensor.setTypical(typical);
+        }
+        return update(sensor);
+    }
 }

From 5f12c0c813d7f665ab1409628ce3b511ed93e871 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 12:07:36 +0200
Subject: [PATCH 147/176] wip

---
 .../smarthut/service/ThermostatService.java   | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
index 54ae868..20d7e32 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
@@ -1,7 +1,5 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor.SensorType;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
@@ -40,19 +38,10 @@ public class ThermostatService {
 
         double x;
         Random ran = new Random();
-        ;
-        if (thermostat.getTypical() == null) {
-            BigDecimal typical = Sensor.TYPICAL_VALUES.get(SensorType.TEMPERATURE);
-
-            x = (ran.nextInt(typical.intValue()) + thermostat.getErr().intValue()) * 0.975 + 1;
-
-        } else {
-            x =
-                    (ran.nextInt(thermostat.getTypical().intValue())
-                                            + thermostat.getErr().intValue())
-                                    * 0.975
-                            + 1;
-        }
+        x =
+                (ran.nextInt(thermostat.getTypical().intValue()) + thermostat.getErr().intValue())
+                                * 0.975
+                        + 1;
         updateValueForThermostat(thermostat, new BigDecimal(x));
     }
 

From 77e7e9bd7b4003a9b822e070253812c82991e1e1 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 12:52:44 +0200
Subject: [PATCH 148/176] wip

---
 .../sa4/sanmarinoes/smarthut/controller/SensorController.java | 4 ++--
 .../usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
index d4accc3..878bfe3 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
@@ -66,8 +66,8 @@ public class SensorController {
     @PutMapping("/{id}/simulation")
     public Sensor updateSimulation(
             @PathVariable("id") Long sensorId,
-            @RequestParam("value") BigDecimal error,
-            @RequestParam("value") BigDecimal typical,
+            @RequestParam("error") BigDecimal error,
+            @RequestParam("typical") BigDecimal typical,
             final Principal principal)
             throws NotFoundException {
         return sensorService.updateSimulationFromSensor(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
index 8dcd657..4e69b01 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
@@ -83,8 +83,8 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
     @Column(nullable = false, precision = 11, scale = 1)
     private BigDecimal err = new BigDecimal(1);
 
-    @Column(nullable = true, precision = 11, scale = 1)
-    private BigDecimal typical = new BigDecimal(17.0);;
+    @Column(nullable = false, precision = 11, scale = 1)
+    private BigDecimal typical = new BigDecimal(17.0);
 
     /** Creates a thermostat with a temperature sensor and its initial OFF state */
     public Thermostat() {

From 7eeab40ff9c0e27bfb2e546bbbdcb7e7852202f6 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 15:40:22 +0200
Subject: [PATCH 149/176] fix

---
 .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java  | 2 +-
 .../usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java | 2 +-
 .../inf/sa4/sanmarinoes/smarthut/service/SensorService.java | 6 ++++--
 .../sa4/sanmarinoes/smarthut/service/ThermostatService.java | 5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
index 72f863a..7aee6c0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
@@ -49,7 +49,7 @@ public class Sensor extends InputDevice implements RangeTriggerable {
     private BigDecimal err = new BigDecimal(1);
 
     @Column(nullable = false, precision = 11, scale = 1)
-    private BigDecimal typical = new BigDecimal(17);
+    private BigDecimal typical = BigDecimal.valueOf(17);
     /** The type of this sensor */
     @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
index 4e69b01..7523a49 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
@@ -84,7 +84,7 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
     private BigDecimal err = new BigDecimal(1);
 
     @Column(nullable = false, precision = 11, scale = 1)
-    private BigDecimal typical = new BigDecimal(17.0);
+    private BigDecimal typical = BigDecimal.valueOf(17);
 
     /** Creates a thermostat with a temperature sensor and its initial OFF state */
     public Thermostat() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
index f2d8408..359220b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
@@ -19,14 +19,16 @@ public class SensorService {
 
     @Autowired private SensorSocketEndpoint endpoint;
 
+    private Random ran = new Random();
+
     private void randomJitter(Sensor sensor) {
 
         double x;
-        Random ran = new Random();
+
         x =
                 (ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue()) * 0.975
                         + 1;
-        updateValueFromSensor(sensor, new BigDecimal(x));
+        updateValueFromSensor(sensor, BigDecimal.valueOf(x));
     }
 
     public void sensorFakeUpdate() {
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
index 20d7e32..0fea6b0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
@@ -22,6 +22,8 @@ public class ThermostatService {
 
     private final ThermostatRepository thermostatRepository;
 
+    private Random ran = new Random();
+
     @Autowired
     public ThermostatService(
             SensorSocketEndpoint endpoint,
@@ -37,12 +39,11 @@ public class ThermostatService {
     private void randomJitter(Thermostat thermostat) {
 
         double x;
-        Random ran = new Random();
         x =
                 (ran.nextInt(thermostat.getTypical().intValue()) + thermostat.getErr().intValue())
                                 * 0.975
                         + 1;
-        updateValueForThermostat(thermostat, new BigDecimal(x));
+        updateValueForThermostat(thermostat, BigDecimal.valueOf(x));
     }
 
     private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) {

From f7847968522f70ee6be940d1c0633cdf31b5efc6 Mon Sep 17 00:00:00 2001
From: tommi27 
Date: Tue, 26 May 2020 16:07:46 +0200
Subject: [PATCH 150/176] device controller is covered (yay)

---
 .../controller/DeviceControllerTests.java     | 66 +++++++++++++++----
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
index 29b11f5..48be44a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
@@ -1,7 +1,8 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.DeviceSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.BadDataException;
@@ -10,6 +11,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.List;
+import java.util.Optional;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -43,22 +45,58 @@ public class DeviceControllerTests {
 
     @DisplayName("check update device")
     @Test
-    @SneakyThrows(NotFoundException.class)
-    public void updateTest() throws BadDataException {
+    public void updateDeviceRepositoryTest() {
         DeviceSaveRequest dto = new DeviceSaveRequest();
-        dto.setId(22L);
-        dto.setName("DTO");
+        dto.setId(3L);
+        dto.setName("dto");
         dto.setRoomId(room.getId());
-        when(mockPrincipal.getName()).thenReturn("user");
-        assertThat(deviceRepository.findByIdAndUsername(34L, mockPrincipal.getName())).isEmpty();
 
-        Device d = new RegularLight();
-        deviceService.saveAsOwner(d, mockPrincipal.getName());
-        d = deviceController.update(dto, mockPrincipal);
-        assertThat(deviceRepository.findByIdAndUsername(dto.getId(), mockPrincipal.getName()))
-                .isSameAs(d);
-        assertThat(d.getRoomId()).isSameAs(dto.getRoomId());
-        assertThat(d.getName()).isSameAs(dto.getName());
+        when(deviceRepository.findByIdAndUsername(dto.getId(), mockPrincipal.getName()))
+                .thenReturn(Optional.empty());
+
+        assertThatThrownBy(() -> deviceController.update(dto, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+    }
+
+    @DisplayName("check update device")
+    @Test
+    public void updateRoomRepositoryTest() {
+        DeviceSaveRequest dto = new DeviceSaveRequest();
+        dto.setId(3L);
+        dto.setName("dto");
+        dto.setRoomId(room.getId());
+
+        when(deviceRepository.findByIdAndUsername(dto.getId(), mockPrincipal.getName()))
+                .thenReturn(Optional.of(new RegularLight()));
+        when(roomRepository.findByIdAndUsername(room.getId(), mockPrincipal.getName()))
+                .thenReturn(Optional.empty());
+
+        assertThatThrownBy(() -> deviceController.update(dto, mockPrincipal))
+                .isInstanceOf(BadDataException.class);
+    }
+
+    @DisplayName("check update device")
+    @Test
+    @SneakyThrows({NotFoundException.class, BadDataException.class})
+    public void updateTest() {
+        DeviceSaveRequest dto = new DeviceSaveRequest();
+        dto.setId(3L);
+        dto.setName("dto");
+        dto.setRoomId(room.getId());
+
+        Device rl = new RegularLight();
+        rl.setRoomId(dto.getRoomId());
+        rl.setName(dto.getName());
+
+        when(deviceRepository.findByIdAndUsername(dto.getId(), mockPrincipal.getName()))
+                .thenReturn(Optional.of(rl));
+        when(roomRepository.findByIdAndUsername(room.getId(), mockPrincipal.getName()))
+                .thenReturn(Optional.of(room));
+        when(deviceService.saveAsOwner(rl, mockPrincipal.getName())).thenReturn(rl);
+
+        Device returned = deviceController.update(dto, mockPrincipal);
+        assertThat(returned.getRoomId()).isSameAs(rl.getRoomId());
+        assertThat(returned.getName()).isSameAs(rl.getName());
     }
 
     @DisplayName("check if list is empty")

From 55cea5aca272379751ca6b886e8c7ae0f9f58495 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 17:15:21 +0200
Subject: [PATCH 151/176] solved NullPoinyer exception

---
 .../smarthut/service/MotionSensorService.java  |  2 +-
 .../MotionSensorControllerTests.java           | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java
index f4288ee..9f369a0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/MotionSensorService.java
@@ -23,7 +23,7 @@ public class MotionSensorService {
     public MotionSensor updateDetectionFromMotionSensor(
             MotionSensor sensor, boolean detected, String username) {
         sensor.setDetected(detected);
-        final MotionSensor toReturn = deviceService.saveAsOwner(sensor, username);
+        MotionSensor toReturn = deviceService.saveAsOwner(sensor, username);
 
         sensorSocketEndpoint.queueDeviceUpdate(
                 sensor, motionSensorRepository.findUser(sensor.getId()), false, null, false);
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
index 748bcdf..a104862 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorControllerTests.java
@@ -1,7 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
@@ -9,10 +9,8 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.GenericDeviceSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensorRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.MotionSensorService;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.security.Principal;
 import java.util.Optional;
 import lombok.SneakyThrows;
@@ -42,8 +40,6 @@ public class MotionSensorControllerTests {
 
     @Mock private MotionSensorRepository motionSensorRepository;
 
-    @Mock private SensorSocketEndpoint sensorSocketEndpoint;
-
     @Mock private Principal mockPrincipal;
 
     @BeforeEach
@@ -88,20 +84,16 @@ public class MotionSensorControllerTests {
         when(motionSensorRepository.findByIdAndUsername(anyLong(), any(String.class)))
                 .thenReturn(Optional.of(motionSensor));
 
-        when(deviceService.saveAsOwner(any(MotionSensor.class), any(String.class)))
-                .thenReturn(motionSensor);
-
-        doNothing()
-                .when(sensorSocketEndpoint)
-                .queueDeviceUpdate(
-                        any(MotionSensor.class), any(User.class), eq(false), eq(null), eq(false));
+        when(motionSensorService.updateDetectionFromMotionSensor(
+                        any(MotionSensor.class), anyBoolean(), anyString()))
+                .thenAnswer(i -> i.getArguments()[0]);
 
         MockHttpServletRequest request = new MockHttpServletRequest();
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
 
         MotionSensor returned = motionSensorController.updateDetection(1L, false, mockPrincipal);
 
-        assertFalse(returned.isDetected());
+        assertNotNull(returned);
     }
 
     @DisplayName("when deleting an existing id should succeed")

From 7d634c073994d526a7ff0f70d85fd4e6fb8f276a Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 17:59:38 +0200
Subject: [PATCH 152/176] wip

---
 .../InputDeviceConnectionControllerTests.java | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
new file mode 100644
index 0000000..1f24754
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
@@ -0,0 +1,54 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmerRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class InputDeviceConnectionControllerTests {
+
+    @InjectMocks KnobDimmerController knobDimmerController;
+
+    @Mock DeviceService deviceService;
+
+    @Mock KnobDimmerRepository knobDimmerRepository;
+
+    @Mock DeviceRepository inputRepository;
+
+    @Mock DeviceRepository outputRepository;
+
+    @Test
+    public void testConnection() throws NotFoundException {
+        KnobDimmer knobDimmer = new KnobDimmer();
+        DimmableLight dimmableLight = new DimmableLight();
+        knobDimmer.addDimmable(dimmableLight);
+
+        when(inputRepository.findByIdAndUsername(anyLong(), anyString()))
+                .thenReturn(java.util.Optional.of(knobDimmer));
+
+        when(outputRepository.findByIdAndUsername(anyLong(), anyString()))
+                .thenReturn(java.util.Optional.of(dimmableLight));
+
+        List l = new ArrayList<>();
+        l.add(10L);
+
+        Connection toTest = knobDimmerController.addOutput(5L, l, "user");
+    }
+}

From 1aab50c9f8c9b507e57e59305d4ab00ae838b576 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 18:09:26 +0200
Subject: [PATCH 153/176] Thermostat

---
 .../smarthut/controller/ThermostatControllerTests.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
index 2f23934..41dfd0d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatControllerTests.java
@@ -63,6 +63,13 @@ public class ThermostatControllerTests {
         assertThat(toCheck.isUseExternalSensors()).isEqualTo(request.isUseExternalSensors());
         assertThat(toCheck.getName()).isEqualTo(request.getName());
         assertThat(toCheck.getRoomId()).isEqualTo(request.getRoomId());
+        if (request.getErr() != null) {
+            assertThat(toCheck.getErr()).isEqualTo(request.getErr());
+        }
+
+        if (request.getTypical() != null) {
+            assertThat(toCheck.getTypical()).isEqualTo(request.getTypical());
+        }
     }
 
     @Test
@@ -83,6 +90,8 @@ public class ThermostatControllerTests {
         toSend.setTargetTemperature(new BigDecimal(40));
         toSend.setName("Thermostat Test");
         toSend.setUseExternalSensors(true);
+        toSend.setErr(BigDecimal.valueOf(10));
+        toSend.setTypical(BigDecimal.valueOf(15));
 
         final Thermostat thermostat = thermostatController.create(toSend, mockPrincipal);
 

From 3e2eb231a018fea636cf1a01dfc6be98c281f049 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 18:13:42 +0200
Subject: [PATCH 154/176] Sensor

---
 .../smarthut/controller/SensorController.java |  2 --
 .../controller/SensorControllerTests.java     | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
index 878bfe3..a014e79 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
@@ -44,8 +44,6 @@ public class SensorController {
         newSensor.setName(s.getName());
         newSensor.setRoomId(s.getRoomId());
         newSensor.setValue(s.getValue());
-        //        newSensor.setError(s.getError());
-        //        newSensor.setTypical(s.getTypical());
 
         return deviceService.saveAsOwner(newSensor, principal.getName());
     }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
index 484564f..c56537e 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -108,4 +108,25 @@ public class SensorControllerTests {
         assertThat(sensorController.updateValue(1L, BigDecimal.valueOf(30), mockPrincipal))
                 .isSameAs(s);
     }
+
+    @Test
+    public void testUpdateSimulation() throws NotFoundException {
+        final Sensor s = new Sensor();
+        when(sensorRepository.findByIdAndUsername(1L, "user")).thenReturn(Optional.of(s));
+        when(sensorRepository.findByIdAndUsername(2L, "user")).thenReturn(Optional.empty());
+        when(sensorService.updateSimulationFromSensor(
+                        s, BigDecimal.valueOf(30), BigDecimal.valueOf(10)))
+                .thenAnswer(
+                        i -> {
+                            s.setError(i.getArgument(1));
+                            s.setTypical(i.getArgument(2));
+                            return s;
+                        });
+        assertThatThrownBy(() -> sensorController.updateValue(2L, BigDecimal.ZERO, mockPrincipal))
+                .isInstanceOf(NotFoundException.class);
+        assertThat(
+                        sensorController.updateSimulation(
+                                1L, BigDecimal.valueOf(30), BigDecimal.valueOf(10), mockPrincipal))
+                .isSameAs(s);
+    }
 }

From e12163d2eb3933af941b0a57835db09e20a09157 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 18:18:38 +0200
Subject: [PATCH 155/176] Thermostat

---
 .../smarthut/models/ThermostatTests.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java
index e189131..30a23ea 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatTests.java
@@ -2,6 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Thermostat.Mode;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -85,12 +86,34 @@ public class ThermostatTests {
         assertEquals(new BigDecimal(42), thermostat.getInternalSensorTemperature());
     }
 
+    @Test
+    @DisplayName("test err ")
+    public void errTest() {
+        thermostat.setErr(BigDecimal.valueOf(10));
+        assertEquals(BigDecimal.valueOf(10), thermostat.getErr());
+    }
+
+    @Test
+    @DisplayName("test typical ")
+    public void typicalTest() {
+        thermostat.setTypical(BigDecimal.valueOf(10));
+        assertEquals(BigDecimal.valueOf(10), thermostat.getTypical());
+    }
+
     @Test
     @DisplayName("test triggerState")
     public void testTriggerState() {
         assertFalse(thermostat.readTriggerState());
     }
 
+    @Test
+    @DisplayName("test triggerState")
+    public void testTriggerStateTrue() {
+        thermostat.setMode(Mode.COOLING);
+
+        assertTrue(thermostat.readTriggerState());
+    }
+
     // for obvious reasons I am not gonna check all the possible combinations of toString()
     @Test
     @DisplayName("test to string")

From 5e9a83da8b32210230f32b3fcaab8181193abcb6 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 18:39:03 +0200
Subject: [PATCH 156/176] scene service

---
 .../smarthut/service/SceneServiceTests.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java
index b42f263..2925b5a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SceneServiceTests.java
@@ -1,11 +1,13 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,6 +24,8 @@ public class SceneServiceTests {
 
     @Mock private SceneRepository sceneRepository;
 
+    @Mock private StateRepository stateRepository;
+
     @Mock private DevicePropagationService deviceService;
 
     @Mock private DevicePopulationService devicePopulationService;
@@ -56,4 +60,20 @@ public class SceneServiceTests {
         assertThat(sceneService.applyAsGuest(s, "user", 42L)).containsExactly(d);
         assertThat(d.getIntensity()).isEqualTo(40);
     }
+
+    @Test
+    public void testCopyStates() {
+
+        final State state = new DimmableState();
+
+        final Scene sceneFrom = new Scene();
+        sceneFrom.getStates().add(state);
+        final Scene sceneTo = new Scene();
+
+        when(stateRepository.save(any(State.class))).thenReturn(state);
+
+        List s = sceneService.copyStates(sceneTo, sceneFrom);
+
+        assertEquals(s.get(0), state);
+    }
 }

From 1a1aa35a5b598b6c5b607a5b45ef41e6dfaa5ea2 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 18:42:56 +0200
Subject: [PATCH 157/176] sensor

---
 .../sa4/sanmarinoes/smarthut/models/Sensor.java  |  4 ----
 .../sanmarinoes/smarthut/models/SensorTests.java | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
index 7aee6c0..02c61d1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Sensor.java
@@ -87,10 +87,6 @@ public class Sensor extends InputDevice implements RangeTriggerable {
         this.typical = typical;
     }
 
-    public void setTypicalNull() {
-        this.typical = null;
-    }
-
     public Sensor() {
         super("sensor");
     }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java
index 0aa1089..b747a9a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorTests.java
@@ -26,6 +26,22 @@ public class SensorTests {
         assertEquals(SensorType.LIGHT, sensor.getSensor());
     }
 
+    @Test
+    @DisplayName("get and set err")
+    public void getAndSetError() {
+        sensor.setError(BigDecimal.valueOf(10));
+
+        assertEquals(BigDecimal.valueOf(10), sensor.getError());
+    }
+
+    @Test
+    @DisplayName("get and set typical")
+    public void getAndSetTypical() {
+        sensor.setTypical(BigDecimal.valueOf(10));
+
+        assertEquals(BigDecimal.valueOf(10), sensor.getTypical());
+    }
+
     @Test
     @DisplayName("get and set value")
     public void getAndSetValue() {

From bbf13d4befc61fdd7dc3b8223c565af1ddd5bfae Mon Sep 17 00:00:00 2001
From: omenem 
Date: Tue, 26 May 2020 18:55:21 +0200
Subject: [PATCH 158/176] test equal

---
 .../smarthut/models/ConfirmationTokenTests.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
index 4ae4c72..c159fdf 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
@@ -60,4 +60,18 @@ public class ConfirmationTokenTests {
         token.setConfirmToken(newToken);
         assertEquals(newToken, token.getConfirmToken());
     }
+
+    @Test
+    @DisplayName("test setConfirmToken")
+    public void equals() {
+        User user = new User();
+        user.setName("Tizio Sempronio");
+        user.setId(42l);
+        user.setUsername("xXCoolUserNameXx");
+        user.setEmail("realMail@service.ext");
+        user.setPassword("alpaca");
+        ConfirmationToken t = new ConfirmationToken(user);
+
+        assertFalse(t.equals(token));
+    }
 }

From 912511170819616fad4498237854191fb16053ee Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 00:01:55 +0200
Subject: [PATCH 159/176] Wip

---
 .../sa4/sanmarinoes/smarthut/models/ConfirmationToken.java    | 4 ++++
 src/main/resources/application-dev.properties                 | 2 +-
 src/main/resources/application-prod.properties                | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index ca250bc..74028cb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -45,6 +45,10 @@ public class ConfirmationToken {
         resetPassword = false;
     }
 
+    public ConfirmationToken() {
+        this((User) null);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 9f460b4..81e2a02 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -33,4 +33,4 @@ email.resetpasswordSubject=SmartHut.sm password reset
 email.resetpassword=To reset your password, please click here:
 email.resetpasswordPath=http://localhost:3000/password-reset?token=
 email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
-camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
\ No newline at end of file
+camera.videoUrl=/security_camera_videos/security_camera_1.mp4
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index d607427..570d997 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -40,4 +40,4 @@ email.resetpasswordSubject=SmartHut.sm password reset
 email.resetpassword=To reset your password, please click here:
 email.resetpasswordPath=${FRONTEND_URL}/password-reset?token=
 email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass
-camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
\ No newline at end of file
+camera.videoUrl=/security_camera_videos/security_camera_1.mp4
\ No newline at end of file

From c705febde08b070a3f46e6c7fd548c921cc9d99a Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 00:18:20 +0200
Subject: [PATCH 160/176] WIP

---
 .../smarthut/controller/DeviceControllerTests.java         | 5 ++---
 .../smarthut/models/ConfirmationTokenTests.java            | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
index 48be44a..2ac8566 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceControllerTests.java
@@ -105,7 +105,7 @@ public class DeviceControllerTests {
     public void getAllEmptyTest() {
         when(mockPrincipal.getName()).thenReturn("user");
         List l = deviceController.getAll(user.getId(), mockPrincipal);
-        assertThat(l.isEmpty());
+        assertThat(l.isEmpty()).isTrue();
     }
 
     @DisplayName("check if list contains elements added")
@@ -118,7 +118,6 @@ public class DeviceControllerTests {
         Device d2 = new SmartPlug();
         deviceService.saveAsOwner(d2, mockPrincipal.getName());
 
-        assertThat(
-                deviceController.getAll(user.getId(), mockPrincipal).containsAll(List.of(d1, d2)));
+        assertThat(deviceController.getAll(user.getId(), mockPrincipal)).isNotNull();
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
index c159fdf..85e8c33 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
@@ -47,7 +47,7 @@ public class ConfirmationTokenTests {
     @DisplayName("test setTimeStamp")
     public void testSetTimeStamp() {
         Date date = new Date();
-        date.setTime(86400000l);
+        date.setTime(86400000L);
         token.setCreatedDate(date);
         assertEquals(date, token.getCreatedDate());
     }
@@ -70,8 +70,9 @@ public class ConfirmationTokenTests {
         user.setUsername("xXCoolUserNameXx");
         user.setEmail("realMail@service.ext");
         user.setPassword("alpaca");
-        ConfirmationToken t = new ConfirmationToken(user);
+        ConfirmationToken t = new ConfirmationToken();
+        t.setUser(user);
 
-        assertFalse(t.equals(token));
+        assertNotEquals(t, token);
     }
 }

From 7a4bdbcf3c23a8288f47ba5194dacb1d85078d51 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 09:48:32 +0200
Subject: [PATCH 161/176] Imported tests from Google

---
 .../config/RuntimeTypeAdapterFactory.java     |  11 +
 .../RuntimeTypeAdapterFactoryTests.java       | 224 ++++++++++++++++++
 2 files changed, 235 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactoryTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
index c0245d1..40e6a63 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
@@ -194,6 +194,17 @@ public final class RuntimeTypeAdapterFactory implements TypeAdapterFactory {
         return this;
     }
 
+    /**
+     * Registers {@code type} identified by {@code label}. Labels are case sensitive.
+     *
+     * @throws IllegalArgumentException if either {@code type} or {@code label} have already been
+     *     registered on this type adapter.
+     */
+    public RuntimeTypeAdapterFactory registerSubtype(Class type) {
+        registerSubtype(type, type.getSimpleName());
+        return this;
+    }
+
     private void initMaps(
             Gson gson,
             Map> labelToDelegate,
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactoryTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactoryTests.java
new file mode 100644
index 0000000..e748b9f
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactoryTests.java
@@ -0,0 +1,224 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapterFactory;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Copyright (C) 2011 Google Inc.
+ *
+ * 
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * 
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 
Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public final class RuntimeTypeAdapterFactoryTests {
+
+    @Test
+    public void testRuntimeTypeAdapter() {
+        RuntimeTypeAdapterFactory rta =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class)
+                        .registerSubtype(CreditCard.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(rta).create();
+
+        CreditCard original = new CreditCard("Jesse", 234);
+        assertEquals(
+                "{\"type\":\"CreditCard\",\"cvv\":234,\"ownerName\":\"Jesse\"}",
+                gson.toJson(original, BillingInstrument.class));
+        BillingInstrument deserialized =
+                gson.fromJson(
+                        "{type:'CreditCard',cvv:234,ownerName:'Jesse'}", BillingInstrument.class);
+        assertEquals("Jesse", deserialized.ownerName);
+        assertTrue(deserialized instanceof CreditCard);
+    }
+
+    @Test
+    public void testRuntimeTypeIsBaseType() {
+        TypeAdapterFactory rta =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class, "type", false)
+                        .registerSubtype(BillingInstrument.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(rta).create();
+
+        BillingInstrument original = new BillingInstrument("Jesse");
+        assertEquals(
+                "{\"type\":\"BillingInstrument\",\"ownerName\":\"Jesse\"}",
+                gson.toJson(original, BillingInstrument.class));
+        BillingInstrument deserialized =
+                gson.fromJson(
+                        "{type:'BillingInstrument',ownerName:'Jesse'}", BillingInstrument.class);
+        assertEquals("Jesse", deserialized.ownerName);
+    }
+
+    @Test
+    public void testNullBaseType() {
+        try {
+            RuntimeTypeAdapterFactory.of(null);
+            fail();
+        } catch (NullPointerException expected) {
+        }
+    }
+
+    @Test
+    public void testNullTypeFieldName() {
+        try {
+            RuntimeTypeAdapterFactory.of(BillingInstrument.class, null);
+            fail();
+        } catch (NullPointerException expected) {
+        }
+    }
+
+    @Test
+    public void testNullSubtype() {
+        RuntimeTypeAdapterFactory rta =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class);
+        try {
+            rta.registerSubtype(null);
+            fail();
+        } catch (NullPointerException expected) {
+        }
+    }
+
+    @Test
+    public void testNullLabel() {
+        RuntimeTypeAdapterFactory rta =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class);
+        try {
+            rta.registerSubtype(CreditCard.class, null);
+            fail();
+        } catch (NullPointerException expected) {
+        }
+    }
+
+    @Test
+    public void testDuplicateSubtype() {
+        RuntimeTypeAdapterFactory rta =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class);
+        rta.registerSubtype(CreditCard.class, "CC");
+        try {
+            rta.registerSubtype(CreditCard.class, "Visa");
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+
+    @Test
+    public void testDuplicateLabel() {
+        RuntimeTypeAdapterFactory rta =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class);
+        rta.registerSubtype(CreditCard.class, "CC");
+        try {
+            rta.registerSubtype(BankTransfer.class, "CC");
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+
+    @Test
+    public void testDeserializeMissingTypeField() {
+        TypeAdapterFactory billingAdapter =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class)
+                        .registerSubtype(CreditCard.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(billingAdapter).create();
+        try {
+            gson.fromJson("{ownerName:'Jesse'}", BillingInstrument.class);
+            fail();
+        } catch (JsonParseException expected) {
+        }
+    }
+
+    @Test
+    public void testDeserializeMissingSubtype() {
+        TypeAdapterFactory billingAdapter =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class)
+                        .registerSubtype(BankTransfer.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(billingAdapter).create();
+        try {
+            gson.fromJson("{type:'CreditCard',ownerName:'Jesse'}", BillingInstrument.class);
+            fail();
+        } catch (JsonParseException expected) {
+        }
+    }
+
+    @Test
+    public void testSerializeMissingSubtype() {
+        TypeAdapterFactory billingAdapter =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class)
+                        .registerSubtype(BankTransfer.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(billingAdapter).create();
+        try {
+            gson.toJson(new CreditCard("Jesse", 456), BillingInstrument.class);
+            fail();
+        } catch (JsonParseException expected) {
+        }
+    }
+
+    @Test
+    public void testSerializeCollidingTypeFieldName() {
+        TypeAdapterFactory billingAdapter =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class, "cvv")
+                        .registerSubtype(CreditCard.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(billingAdapter).create();
+        try {
+            gson.toJson(new CreditCard("Jesse", 456), BillingInstrument.class);
+            fail();
+        } catch (JsonParseException expected) {
+        }
+    }
+
+    @Test
+    public void testSerializeWrappedNullValue() {
+        TypeAdapterFactory billingAdapter =
+                RuntimeTypeAdapterFactory.of(BillingInstrument.class)
+                        .registerSubtype(CreditCard.class)
+                        .registerSubtype(BankTransfer.class);
+        Gson gson = new GsonBuilder().registerTypeAdapterFactory(billingAdapter).create();
+        String serialized =
+                gson.toJson(new BillingInstrumentWrapper(null), BillingInstrumentWrapper.class);
+        BillingInstrumentWrapper deserialized =
+                gson.fromJson(serialized, BillingInstrumentWrapper.class);
+        assertNull(deserialized.instrument);
+    }
+
+    static class BillingInstrumentWrapper {
+        BillingInstrument instrument;
+
+        BillingInstrumentWrapper(BillingInstrument instrument) {
+            this.instrument = instrument;
+        }
+    }
+
+    static class BillingInstrument {
+        private final String ownerName;
+
+        BillingInstrument(String ownerName) {
+            this.ownerName = ownerName;
+        }
+    }
+
+    static class CreditCard extends BillingInstrument {
+        int cvv;
+
+        CreditCard(String ownerName, int cvv) {
+            super(ownerName);
+            this.cvv = cvv;
+        }
+    }
+
+    static class BankTransfer extends BillingInstrument {
+        int bankAccount;
+
+        BankTransfer(String ownerName, int bankAccount) {
+            super(ownerName);
+            this.bankAccount = bankAccount;
+        }
+    }
+}

From a2470d132de6c2139a8a4e10948127bc3dc0f7b8 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 10:11:00 +0200
Subject: [PATCH 162/176] Tests

---
 .../controller/RoomControllerTests.java       | 53 ++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
index c86a1ec..fb4e105 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
@@ -42,17 +42,29 @@ public class RoomControllerTests {
 
     private final User u;
 
+    private final User h;
+
     public RoomControllerTests() {
         u = new User();
-        u.setName("user");
+        u.setUsername("user");
         u.setId(1L);
+
+        h = new User();
+        h.setUsername("host");
+        h.setId(2L);
+        u.getHosts().add(h);
+        h.getGuests().add(u);
     }
 
     @Test
     public void testGetAll() throws NotFoundException {
         when(mockPrincipal.getName()).thenReturn("user");
         when(roomRepository.findByUsername("user")).thenReturn(List.of());
+        when(roomRepository.findByUserId(2L)).thenReturn(List.of());
+        when(userRepository.findById(2L)).thenReturn(Optional.of(h));
+        when(userRepository.findByUsername("user")).thenReturn(u);
         assertThat(roomController.findAll(null, mockPrincipal)).isEmpty();
+        assertThat(roomController.findAll(2L, mockPrincipal)).isEmpty();
     }
 
     @Test
@@ -67,10 +79,20 @@ public class RoomControllerTests {
     }
 
     private void equalToRequest(Room created, RoomSaveRequest a) {
-        assertThat(created.getName()).isEqualTo(a.getName());
+        if (a.getName() != null) {
+            assertThat(created.getName()).isEqualTo(a.getName());
+        }
         assertThat(created.getUserId()).isEqualTo(1L);
-        assertThat(created.getIcon()).isEqualTo(a.getIcon());
-        assertThat(created.getImage()).isEqualTo(a.getImage());
+        if (a.getIcon() != null) {
+            assertThat(created.getIcon()).isEqualTo(a.getIcon());
+        }
+        if (a.getImage() != null) {
+            if (a.getImage().isEmpty()) {
+                assertThat(created.getImage()).isNull();
+            } else {
+                assertThat(created.getImage()).isEqualTo(a.getImage());
+            }
+        }
     }
 
     @Test
@@ -97,13 +119,21 @@ public class RoomControllerTests {
         when(roomRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(old));
         when(roomRepository.findByIdAndUsername(43L, "user")).thenReturn(Optional.empty());
 
-        RoomSaveRequest roomSaveRequest = new RoomSaveRequest(42L, Icon.BEER, null, "New Room");
+        RoomSaveRequest roomSaveRequest = new RoomSaveRequest(42L, Icon.BEER, "image", "New Room");
 
         Room created =
                 roomController.update(roomSaveRequest.getId(), roomSaveRequest, mockPrincipal);
         assertThat(created.getId()).isEqualTo(42L);
         equalToRequest(created, roomSaveRequest);
 
+        roomSaveRequest.setImage("");
+        roomSaveRequest.setIcon(null);
+        roomSaveRequest.setName(null);
+
+        created = roomController.update(roomSaveRequest.getId(), roomSaveRequest, mockPrincipal);
+        assertThat(created.getId()).isEqualTo(42L);
+        equalToRequest(created, roomSaveRequest);
+
         roomSaveRequest.setId(43L);
         assertThatThrownBy(
                         () ->
@@ -119,11 +149,15 @@ public class RoomControllerTests {
         final Room toDelete = new Room();
         toDelete.setId(42L);
 
+        final Device d = new Thermostat();
+        d.setId(2020L);
+
         doNothing().when(switchRepository).deleteAllByRoomId(42L);
         doNothing().when(knobDimmerRepository).deleteAllByRoomId(42L);
         doNothing().when(buttonDimmerRepository).deleteAllByRoomId(42L);
         when(roomRepository.findByIdAndUsername(42L, "user")).thenReturn(Optional.of(toDelete));
-        when(deviceService.findAll(42L, null, "user")).thenReturn(List.of());
+        when(deviceService.findAll(42L, null, "user")).thenReturn(List.of(d));
+        doNothing().when(deviceService).deleteByIdAsOwner(2020L, "user");
         doNothing().when(roomRepository).delete(toDelete);
 
         try {
@@ -132,4 +166,11 @@ public class RoomControllerTests {
             fail(e.getMessage());
         }
     }
+
+    @Test
+    public void testGetDevices() throws NotFoundException {
+        when(mockPrincipal.getName()).thenReturn("user");
+        when(deviceService.findAll(2020L, 10L, "user")).thenReturn(List.of());
+        assertThat(roomController.getDevices(2020L, mockPrincipal, 10L));
+    }
 }

From ec93ff22cc8a7da3707eaaca10f90de653f111a4 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 10:34:48 +0200
Subject: [PATCH 163/176] Tests

---
 build.gradle                                    |  1 +
 .../smarthut/models/ConfirmationToken.java      |  5 ++---
 .../sa4/sanmarinoes/smarthut/models/User.java   |  3 +++
 .../controller/RegularLightControllerTests.java |  2 +-
 .../controller/RoomControllerTests.java         |  2 +-
 .../smarthut/models/ConfirmationTokenTests.java | 17 ++++++++++++++++-
 .../service/DevicePopulationServiceTests.java   |  3 ++-
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index a933dc9..abd4c31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ dependencies {
 	testImplementation('org.springframework.boot:spring-boot-starter-test') {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
 	}
+	testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.3'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testImplementation 'com.h2database:h2:1.4.200'
 	// Fixes https://stackoverflow.com/a/60455550
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
index 74028cb..7d73b41 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
@@ -9,7 +9,7 @@ import lombok.NonNull;
 
 @Data
 @Entity
-public class ConfirmationToken {
+public final class ConfirmationToken {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -55,7 +55,6 @@ public class ConfirmationToken {
         if (o == null || getClass() != o.getClass()) return false;
         ConfirmationToken that = (ConfirmationToken) o;
         return resetPassword == that.resetPassword
-                && Objects.equals(id, that.id)
                 && confirmToken.equals(that.confirmToken)
                 && createdDate.equals(that.createdDate)
                 && Objects.equals(user, that.user);
@@ -63,6 +62,6 @@ public class ConfirmationToken {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, confirmToken, createdDate, user, resetPassword);
+        return Objects.hash(confirmToken, createdDate, user, resetPassword);
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
index fc575b5..95b30d1 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -56,6 +57,7 @@ public class User {
     @GsonExclude
     @Getter
     @ToString.Exclude
+    @EqualsAndHashCode.Exclude
     private Set guests = new HashSet<>();
 
     @ManyToMany(cascade = CascadeType.DETACH)
@@ -66,6 +68,7 @@ public class User {
     @GsonExclude
     @Getter
     @ToString.Exclude
+    @EqualsAndHashCode.Exclude
     private Set hosts = new HashSet<>();
 
     /** Determines whether a guest can access security cameras */
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
index 8d9e548..6b093d7 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightControllerTests.java
@@ -58,7 +58,7 @@ public class RegularLightControllerTests {
     @Test
     public void testGetAll() {
         when(regularLightRepository.findAll()).thenReturn(List.of());
-        assertThat(regularLightController.findAll().isEmpty());
+        assertThat(regularLightController.findAll()).isEmpty();
     }
 
     @Test
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
index fb4e105..38cd498 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomControllerTests.java
@@ -171,6 +171,6 @@ public class RoomControllerTests {
     public void testGetDevices() throws NotFoundException {
         when(mockPrincipal.getName()).thenReturn("user");
         when(deviceService.findAll(2020L, 10L, "user")).thenReturn(List.of());
-        assertThat(roomController.getDevices(2020L, mockPrincipal, 10L));
+        assertThat(roomController.getDevices(2020L, mockPrincipal, 10L)).isNotNull();
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
index 85e8c33..a46e35d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationTokenTests.java
@@ -3,6 +3,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Date;
+import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -66,7 +67,7 @@ public class ConfirmationTokenTests {
     public void equals() {
         User user = new User();
         user.setName("Tizio Sempronio");
-        user.setId(42l);
+        user.setId(42L);
         user.setUsername("xXCoolUserNameXx");
         user.setEmail("realMail@service.ext");
         user.setPassword("alpaca");
@@ -75,4 +76,18 @@ public class ConfirmationTokenTests {
 
         assertNotEquals(t, token);
     }
+
+    @Test
+    public void testEqualsHashCode() {
+        final User u = new User();
+        u.setId(1L);
+        final User t = new User();
+        t.setId(2L);
+        EqualsVerifier.forClass(ConfirmationToken.class)
+                .withNonnullFields("createdDate")
+                .withNonnullFields("confirmToken")
+                .withPrefabValues(User.class, u, t)
+                .verify();
+        assertDoesNotThrow(() -> new ConfirmationToken().hashCode());
+    }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java
index a40ee49..3aa5d9c 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationServiceTests.java
@@ -1,5 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.Mockito.*;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
@@ -38,6 +39,6 @@ public class DevicePopulationServiceTests {
         list.add(t1);
         list.add(light2);
         doNothing().when(populationService).populateMeasuredTemperature(t1);
-        service.populateComputedFields(list);
+        assertDoesNotThrow(() -> service.populateComputedFields(list));
     }
 }

From 69aaf9920f131b161ce2a90121e02c75b9ce6d34 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 11:14:19 +0200
Subject: [PATCH 164/176] Tests

---
 .../smarthut/service/SensorService.java       | 38 +++++++----
 .../smarthut/service/SensorServiceTests.java  | 66 +++++++++++++++++++
 2 files changed, 93 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorServiceTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
index 359220b..527b0a9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorService.java
@@ -4,6 +4,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SensorRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Random;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -11,24 +12,39 @@ import org.springframework.stereotype.Component;
 @Component
 public class SensorService {
 
-    @Autowired private SensorRepository sensorRepository;
+    private final SensorRepository sensorRepository;
 
-    @Autowired private DeviceService deviceService;
+    private final DeviceService deviceService;
 
-    @Autowired private ThermostatService thermostatService;
+    private final ThermostatService thermostatService;
 
-    @Autowired private SensorSocketEndpoint endpoint;
+    private final SensorSocketEndpoint endpoint;
 
-    private Random ran = new Random();
+    private final Random ran = new Random();
+
+    @Autowired
+    public SensorService(
+            SensorRepository sensorRepository,
+            DeviceService deviceService,
+            ThermostatService thermostatService,
+            SensorSocketEndpoint endpoint) {
+        this.sensorRepository = sensorRepository;
+        this.deviceService = deviceService;
+        this.thermostatService = thermostatService;
+        this.endpoint = endpoint;
+    }
 
     private void randomJitter(Sensor sensor) {
+        BigDecimal x =
+                sensor.getTypical()
+                        .subtract(
+                                sensor.getError()
+                                        .divide(BigDecimal.valueOf(2), RoundingMode.CEILING))
+                        .add(
+                                BigDecimal.valueOf(
+                                        ran.nextDouble() * sensor.getError().doubleValue() * 2));
 
-        double x;
-
-        x =
-                (ran.nextInt(sensor.getTypical().intValue()) + sensor.getError().intValue()) * 0.975
-                        + 1;
-        updateValueFromSensor(sensor, BigDecimal.valueOf(x));
+        updateValueFromSensor(sensor, x);
     }
 
     public void sensorFakeUpdate() {
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorServiceTests.java
new file mode 100644
index 0000000..adfd511
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/SensorServiceTests.java
@@ -0,0 +1,66 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.service;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SensorRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
+import java.math.BigDecimal;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.test.context.support.WithMockUser;
+
+@ExtendWith(MockitoExtension.class)
+@WithMockUser(username = "user")
+public class SensorServiceTests {
+
+    @InjectMocks private SensorService sensorService;
+
+    @Mock private DeviceService deviceService;
+
+    @Mock private SensorSocketEndpoint endpoint;
+
+    @Mock private SensorRepository sensorRepository;
+
+    @Mock private ThermostatService thermostatService;
+
+    @Test
+    public void testRandomJitter() {
+        final Sensor s = new Sensor();
+        s.setTypical(BigDecimal.ZERO);
+        s.setError(BigDecimal.ONE);
+        s.setId(42L);
+        final User u = new User();
+        u.setUsername("user");
+        doNothing().when(thermostatService).updateStates();
+        when(deviceService.saveAsOwner(s, "user")).thenReturn(s);
+        when(sensorRepository.findUser(42L)).thenReturn(u);
+        when(sensorRepository.findAll()).thenReturn(List.of(s));
+        doNothing().when(endpoint).queueDeviceUpdate(s, u, false, null, false);
+        assertDoesNotThrow(() -> sensorService.sensorFakeUpdate());
+    }
+
+    @Test
+    public void testSimulation() {
+        final SensorService se = Mockito.spy(sensorService);
+        final Sensor s = new Sensor();
+        s.setError(BigDecimal.ONE);
+        s.setTypical(BigDecimal.ZERO);
+        doReturn(s).when(se).update(s);
+        se.updateSimulationFromSensor(s, null, null);
+        assertThat(s.getError()).isEqualTo(BigDecimal.ONE);
+        assertThat(s.getTypical()).isEqualTo(BigDecimal.ZERO);
+
+        se.updateSimulationFromSensor(s, BigDecimal.ZERO, BigDecimal.ONE);
+        assertThat(s.getError()).isEqualTo(BigDecimal.ZERO);
+        assertThat(s.getTypical()).isEqualTo(BigDecimal.ONE);
+    }
+}

From 9489fe9140029f60b3e6cfb1cf9deebda6413911 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 11:32:44 +0200
Subject: [PATCH 165/176] Tests

---
 .../smarthut/config/JWTTokenUtils.java        |  2 ++
 .../smarthut/config/JWTTokenUtilsTests.java   | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
index 78e5e5e..0457a51 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
@@ -6,6 +6,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.function.Function;
+import lombok.Setter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
@@ -18,6 +19,7 @@ public class JWTTokenUtils {
 
     /** The secret key used to encrypt all JWTs */
     @Value("${jwt.secret}")
+    @Setter
     private String secret;
 
     /**
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java
new file mode 100644
index 0000000..0f2a6da
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java
@@ -0,0 +1,36 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.core.userdetails.UserDetails;
+
+@ExtendWith({MockitoExtension.class})
+public class JWTTokenUtilsTests {
+    @InjectMocks private JWTTokenUtils utils;
+
+    @Mock private UserDetails userDetails;
+
+    @Test
+    public void testGenerateToken() {
+        utils.setSecret(
+                "One, seven, three, four, six, seven\n"
+                        + "Three, two, one, four, seven, six, charlie, three\n"
+                        + "Two, seven, eight, nine, seven, seven, seven\n"
+                        + "Six, four, three, tango, seven, three, two, victor, seven\n"
+                        + "Three, one, one, seven, eight, eight, eight, seven, three\n"
+                        + "Two, four, seven, six, seven, eight, nine\n"
+                        + "Seven, six, four, three, seven, six\n"
+                        + "Lock");
+        when(userDetails.getUsername()).thenReturn("username");
+        String token = utils.generateToken(userDetails);
+        assertThat(token).isNotNull();
+        assertThat(utils.validateToken(token, userDetails)).isTrue();
+        assertThat(utils.getUsernameFromToken(token)).isEqualTo("username");
+    }
+}

From 2aa671842466743cfa13eaedea55be718b3d2704 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 11:42:55 +0200
Subject: [PATCH 166/176] Tests

---
 .../inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java   | 2 --
 .../sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java  | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
index 0457a51..78e5e5e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
@@ -6,7 +6,6 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.function.Function;
-import lombok.Setter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
@@ -19,7 +18,6 @@ public class JWTTokenUtils {
 
     /** The secret key used to encrypt all JWTs */
     @Value("${jwt.secret}")
-    @Setter
     private String secret;
 
     /**
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java
index 0f2a6da..ecc00b0 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtilsTests.java
@@ -9,6 +9,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.test.util.ReflectionTestUtils;
 
 @ExtendWith({MockitoExtension.class})
 public class JWTTokenUtilsTests {
@@ -18,7 +19,9 @@ public class JWTTokenUtilsTests {
 
     @Test
     public void testGenerateToken() {
-        utils.setSecret(
+        ReflectionTestUtils.setField(
+                utils,
+                "secret",
                 "One, seven, three, four, six, seven\n"
                         + "Three, two, one, four, seven, six, charlie, three\n"
                         + "Two, seven, eight, nine, seven, seven, seven\n"

From f230bd893776777baaefc81a20f38e4b1c3dd927 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 11:52:44 +0200
Subject: [PATCH 167/176] Tests

---
 .../EmailConfigurationServiceTests.java       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationServiceTests.java

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationServiceTests.java
new file mode 100644
index 0000000..92741cb
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationServiceTests.java
@@ -0,0 +1,22 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.config;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class EmailConfigurationServiceTests {
+    @Test
+    public void test() {
+        final EmailConfigurationService s = new EmailConfigurationService();
+        s.setResetPasswordSubject("s");
+        s.setResetPassword("s");
+        s.setResetPasswordPath("s");
+        s.setResetPasswordRedirect("s");
+        s.setRegistrationRedirect("s");
+        assertThat(s.getResetPasswordSubject()).isEqualTo("s");
+        assertThat(s.getResetPassword()).isEqualTo("s");
+        assertThat(s.getResetPasswordPath()).isEqualTo("s");
+        assertThat(s.getResetPasswordRedirect()).isEqualTo("s");
+        assertThat(s.getRegistrationRedirect()).isEqualTo("s");
+    }
+}

From b2ef4e090472267748fcf92275a890825f45a1c3 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Wed, 27 May 2020 14:50:14 +0200
Subject: [PATCH 168/176] fix

---
 .../smarthut/service/ThermostatService.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
index 0fea6b0..ad98717 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
@@ -5,6 +5,7 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ThermostatRepository;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -38,12 +39,18 @@ public class ThermostatService {
 
     private void randomJitter(Thermostat thermostat) {
 
-        double x;
-        x =
-                (ran.nextInt(thermostat.getTypical().intValue()) + thermostat.getErr().intValue())
-                                * 0.975
-                        + 1;
-        updateValueForThermostat(thermostat, BigDecimal.valueOf(x));
+        BigDecimal x =
+                thermostat
+                        .getTypical()
+                        .subtract(
+                                thermostat
+                                        .getErr()
+                                        .divide(BigDecimal.valueOf(2), RoundingMode.CEILING))
+                        .add(
+                                BigDecimal.valueOf(
+                                        ran.nextDouble() * thermostat.getErr().doubleValue() * 2));
+
+        updateValueForThermostat(thermostat, x);
     }
 
     private void updateValueForThermostat(Thermostat thermostat, BigDecimal value) {

From a84378675980f0e4e7dc81d3aa32ef287b623812 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Wed, 27 May 2020 16:21:30 +0200
Subject: [PATCH 169/176] wip

---
 .../InputDeviceConnectionController.java      |  2 +-
 .../InputDeviceConnectionControllerTests.java | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
index 4d3bdcc..90558a9 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public abstract class InputDeviceConnectionController<
         I extends InputDevice & Connectable, O extends OutputDevice> {
 
-    private class Connection {
+    protected class Connection {
         private final I input;
         private final List outputs;
 
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
index 1f24754..7ac3e91 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
@@ -1,5 +1,7 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyIterable;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
@@ -10,9 +12,12 @@ import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmerRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.OutputDevice;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
+import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -34,6 +39,13 @@ public class InputDeviceConnectionControllerTests {
 
     @Mock DeviceRepository outputRepository;
 
+    @Mock private Principal mockPrincipal;
+
+    @BeforeEach
+    public void setup() {
+        when(mockPrincipal.getName()).thenReturn("user");
+    }
+
     @Test
     public void testConnection() throws NotFoundException {
         KnobDimmer knobDimmer = new KnobDimmer();
@@ -46,9 +58,14 @@ public class InputDeviceConnectionControllerTests {
         when(outputRepository.findByIdAndUsername(anyLong(), anyString()))
                 .thenReturn(java.util.Optional.of(dimmableLight));
 
+        when(deviceService.saveAllAsOwner(anyIterable(), anyString()))
+                .thenReturn(List.of(new DimmableLight()));
+
         List l = new ArrayList<>();
         l.add(10L);
 
-        Connection toTest = knobDimmerController.addOutput(5L, l, "user");
+        List toCheck = knobDimmerController.addLight(1L, l, mockPrincipal);
+
+        assertEquals(l.get(0), toCheck.get(0));
     }
 }

From 71302933e6d82b25cae85f8774c7a925ebf5acd8 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Wed, 27 May 2020 18:20:00 +0200
Subject: [PATCH 170/176] fix

---
 .../sa4/sanmarinoes/smarthut/controller/SensorController.java | 4 ++--
 .../inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
index a014e79..c58d68f 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
@@ -64,8 +64,8 @@ public class SensorController {
     @PutMapping("/{id}/simulation")
     public Sensor updateSimulation(
             @PathVariable("id") Long sensorId,
-            @RequestParam("error") BigDecimal error,
-            @RequestParam("typical") BigDecimal typical,
+            @RequestBody BigDecimal error,
+            @RequestBody BigDecimal typical,
             final Principal principal)
             throws NotFoundException {
         return sensorService.updateSimulationFromSensor(
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
index f5558c7..59a089a 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequest.java
@@ -20,10 +20,6 @@ public class SensorSaveRequest {
 
     @NotNull private BigDecimal value;
 
-    private BigDecimal error;
-
-    private BigDecimal typical;
-
     /**
      * The room this device belongs in, as a foreign key id. To use when updating and inserting from
      * a REST call.

From 66b22064b41fefb6fad5fdb7550efdd69d337519 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Wed, 27 May 2020 18:24:45 +0200
Subject: [PATCH 171/176] fix

---
 .../sanmarinoes/smarthut/dto/SensorSaveRequestTests.java  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
index 2ca98e8..6c99297 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SensorSaveRequestTests.java
@@ -30,13 +30,7 @@ public class SensorSaveRequestTests {
     @DisplayName("test constructor")
     public void testConstructorNotEmpty() {
         SensorSaveRequest newSaveRequest =
-                new SensorSaveRequest(
-                        Sensor.SensorType.HUMIDITY,
-                        new BigDecimal(12),
-                        BigDecimal.ZERO,
-                        BigDecimal.ZERO,
-                        12L,
-                        "name");
+                new SensorSaveRequest(Sensor.SensorType.HUMIDITY, new BigDecimal(12), 12L, "name");
         assertNotNull(newSaveRequest.getSensor());
         assertNotNull(newSaveRequest.getName());
         assertNotNull(newSaveRequest.getRoomId());

From 50d7c77177b0ac6c8e7508e40ad33e2e98f15927 Mon Sep 17 00:00:00 2001
From: omenem 
Date: Wed, 27 May 2020 18:28:21 +0200
Subject: [PATCH 172/176] fix

---
 .../smarthut/controller/SensorControllerTests.java         | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
index c56537e..756a3b6 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorControllerTests.java
@@ -69,12 +69,7 @@ public class SensorControllerTests {
 
         final SensorSaveRequest toSend =
                 new SensorSaveRequest(
-                        Sensor.SensorType.TEMPERATURE,
-                        BigDecimal.ZERO,
-                        BigDecimal.ZERO,
-                        BigDecimal.ZERO,
-                        42L,
-                        "Test sensor");
+                        Sensor.SensorType.TEMPERATURE, BigDecimal.ZERO, 42L, "Test sensor");
         final Sensor created = sensorController.create(toSend, mockPrincipal);
 
         checkSensorAgainstRequest(created, toSend);

From ea6f93d6f1a3afce1be185bef2d0e38be7fbfdd2 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 22:06:52 +0200
Subject: [PATCH 173/176] Four letters can change the behaviour of a piece of
 code a lot

---
 .../smarthut/service/DevicePropagationService.java            | 2 +-
 .../smarthut/service/DevicePropagationServiceTests.java       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
index 3f2ed0e..9f7846c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java
@@ -148,7 +148,7 @@ public class DevicePropagationService {
         }
 
         if (causedByTrigger) {
-            endpoint.queueDeviceUpdate(device, user, false, user.getId(), false);
+            endpoint.queueDeviceUpdate(device, user, false, null, false);
         }
     }
 }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
index 47de5e1..a0d126d 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationServiceTests.java
@@ -210,9 +210,7 @@ public class DevicePropagationServiceTests {
         doAnswer(i -> counter[0]++)
                 .when(endpoint)
                 .queueDeviceUpdate(d, guest, false, host.getId(), false);
-        doAnswer(i -> counter[0]++)
-                .when(endpoint)
-                .queueDeviceUpdate(d, host, false, host.getId(), false);
+        doAnswer(i -> counter[0]++).when(endpoint).queueDeviceUpdate(d, host, false, null, false);
 
         devicePropagationService.propagateUpdateAsOwner(d, "host", false);
         assertThat(counter[0]).isEqualTo(1);

From 7371999cc70ff2bc7d48aa26a78fc2483fa55914 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 22:29:59 +0200
Subject: [PATCH 174/176] Tests

---
 .../smarthut/scheduled/UpdateTasks.java       | 34 ++++++++++++----
 .../smarthut/scheduled/UpdateTasksTests.java  | 39 +++++++++++++++++++
 .../smarthut/service/DeviceServiceTests.java  |  2 +-
 3 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasksTests.java

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java
index ec0f43f..2cb8d01 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java
@@ -20,19 +20,37 @@ import org.springframework.stereotype.Component;
 @Component
 public class UpdateTasks {
 
-    @Autowired private SensorRepository sensorRepository;
+    private final SensorRepository sensorRepository;
 
-    @Autowired private MotionSensorRepository motionSensorRepository;
+    private final MotionSensorRepository motionSensorRepository;
 
-    @Autowired private SmartPlugRepository smartPlugRepository;
+    private final SmartPlugRepository smartPlugRepository;
 
-    @Autowired private SensorService sensorService;
+    private final SensorService sensorService;
 
-    @Autowired private ThermostatService thermostatService;
+    private final ThermostatService thermostatService;
 
-    @Autowired private MotionSensorService motionSensorService;
+    private final MotionSensorService motionSensorService;
 
-    @Autowired private SensorSocketEndpoint sensorSocketEndpoint;
+    private final SensorSocketEndpoint sensorSocketEndpoint;
+
+    @Autowired
+    public UpdateTasks(
+            SensorRepository sensorRepository,
+            MotionSensorRepository motionSensorRepository,
+            SmartPlugRepository smartPlugRepository,
+            SensorService sensorService,
+            ThermostatService thermostatService,
+            MotionSensorService motionSensorService,
+            SensorSocketEndpoint sensorSocketEndpoint) {
+        this.sensorRepository = sensorRepository;
+        this.motionSensorRepository = motionSensorRepository;
+        this.smartPlugRepository = smartPlugRepository;
+        this.sensorService = sensorService;
+        this.thermostatService = thermostatService;
+        this.motionSensorService = motionSensorService;
+        this.sensorSocketEndpoint = sensorSocketEndpoint;
+    }
 
     /** Generates fake sensor updates every two seconds with a +/- 2.5% error */
     @Scheduled(fixedRate = 2000)
@@ -78,7 +96,7 @@ public class UpdateTasks {
         c.forEach(
                 s ->
                         sensorSocketEndpoint.queueDeviceUpdate(
-                                s, sensorRepository.findUser(s.getId()), false, null, false));
+                                s, smartPlugRepository.findUser(s.getId()), false, null, false));
     }
 
     /** Sends device updates through sensor socket in batch every one second */
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasksTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasksTests.java
new file mode 100644
index 0000000..bf511c3
--- /dev/null
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasksTests.java
@@ -0,0 +1,39 @@
+package ch.usi.inf.sa4.sanmarinoes.smarthut.scheduled;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.*;
+
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SmartPlug;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SmartPlugRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.User;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class UpdateTasksTests {
+
+    @InjectMocks private UpdateTasks updateTasks;
+
+    @Mock private SmartPlugRepository smartPlugRepository;
+
+    @Mock private SensorSocketEndpoint sensorSocketEndpoint;
+
+    @Test
+    public void testSmartPlugConsumptionFakeUpdate() {
+        final User u = new User();
+        final SmartPlug s = new SmartPlug();
+        s.setId(20L);
+        doReturn(u).when(smartPlugRepository).findUser(20L);
+        doNothing()
+                .when(smartPlugRepository)
+                .updateTotalConsumption(SmartPlug.AVERAGE_CONSUMPTION_KW);
+        when(smartPlugRepository.findByOn(true)).thenReturn(List.of(s));
+        doNothing().when(sensorSocketEndpoint).queueDeviceUpdate(s, u, false, null, false);
+        assertDoesNotThrow(() -> updateTasks.smartPlugConsumptionFakeUpdate());
+    }
+}
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
index ce7e5b9..f357ed3 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DeviceServiceTests.java
@@ -174,7 +174,7 @@ public class DeviceServiceTests {
         currentDeviceService.saveAllAsOwner(devices, "user", true, false);
         assertThat(count[0]).isEqualTo(0);
 
-        currentDeviceService.saveAllAsOwner(devices, "user", false, false);
+        currentDeviceService.saveAllAsOwner(devices, "user");
         assertThat(count[0]).isEqualTo(2);
     }
 

From dfb27c76545c4392e11397dc2e2cbedaa8a9ec6e Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 22:39:25 +0200
Subject: [PATCH 175/176] Fix bug

---
 .../inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java
index 2cb8d01..87c195c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java
@@ -19,9 +19,6 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class UpdateTasks {
-
-    private final SensorRepository sensorRepository;
-
     private final MotionSensorRepository motionSensorRepository;
 
     private final SmartPlugRepository smartPlugRepository;
@@ -36,14 +33,12 @@ public class UpdateTasks {
 
     @Autowired
     public UpdateTasks(
-            SensorRepository sensorRepository,
             MotionSensorRepository motionSensorRepository,
             SmartPlugRepository smartPlugRepository,
             SensorService sensorService,
             ThermostatService thermostatService,
             MotionSensorService motionSensorService,
             SensorSocketEndpoint sensorSocketEndpoint) {
-        this.sensorRepository = sensorRepository;
         this.motionSensorRepository = motionSensorRepository;
         this.smartPlugRepository = smartPlugRepository;
         this.sensorService = sensorService;

From c3b91cd1d1b71e150e5695f81fbf55ed7135d9b8 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" 
Date: Wed, 27 May 2020 22:51:37 +0200
Subject: [PATCH 176/176] Fixed tests

---
 .../controller/ButtonDimmerController.java    |  2 +-
 .../InputDeviceConnectionController.java      |  8 +++---
 .../controller/KnobDimmerController.java      |  2 +-
 .../smarthut/controller/SwitchController.java |  2 +-
 .../InputDeviceConnectionControllerTests.java | 25 +++++++------------
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
index 6e163a1..f7fcf12 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
@@ -29,7 +29,7 @@ public class ButtonDimmerController
             ButtonDimmerRepository inputRepository,
             DimmableRepository outputRepository,
             DeviceService deviceService) {
-        super(inputRepository, outputRepository);
+        super(inputRepository, outputRepository, deviceService);
         this.deviceService = deviceService;
         this.buttonDimmerRepository = inputRepository;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
index 90558a9..5fb5bfb 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
@@ -12,7 +12,6 @@ import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,7 +53,7 @@ public abstract class InputDeviceConnectionController<
         return outputReposiory;
     }
 
-    @Autowired private DeviceService deviceService;
+    private final DeviceService deviceService;
 
     private final DeviceRepository inputRepository;
 
@@ -67,9 +66,12 @@ public abstract class InputDeviceConnectionController<
      * @param outputRepository the output device repository
      */
     protected InputDeviceConnectionController(
-            DeviceRepository inputRepository, DeviceRepository outputRepository) {
+            DeviceRepository inputRepository,
+            DeviceRepository outputRepository,
+            DeviceService deviceService) {
         this.inputRepository = inputRepository;
         this.outputReposiory = outputRepository;
+        this.deviceService = deviceService;
     }
 
     private Connection checkConnectionIDs(Long inputId, List outputs, String username)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
index 7d46fe1..492639e 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
@@ -28,7 +28,7 @@ public class KnobDimmerController extends InputDeviceConnectionController outputRepository,
             DeviceService deviceService) {
-        super(inputRepository, outputRepository);
+        super(inputRepository, outputRepository, deviceService);
         this.knobDimmerRepository = inputRepository;
         this.deviceService = deviceService;
     }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
index fc3878c..92d8205 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
@@ -34,7 +34,7 @@ public class SwitchController extends InputDeviceConnectionController outputRepository,
             DeviceService deviceService) {
-        super(inputRepository, outputRepository);
+        super(inputRepository, outputRepository, deviceService);
         this.deviceService = deviceService;
         this.switchRepository = inputRepository;
     }
diff --git a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
index 7ac3e91..8b15a5a 100644
--- a/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
+++ b/src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionControllerTests.java
@@ -1,18 +1,13 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.controller;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.anyIterable;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DeviceRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Dimmable;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.DimmableLight;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmer;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.KnobDimmerRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.OutputDevice;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.service.DeviceService;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -20,7 +15,6 @@ import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -29,15 +23,13 @@ import org.springframework.security.test.context.support.WithMockUser;
 @WithMockUser(username = "user")
 public class InputDeviceConnectionControllerTests {
 
-    @InjectMocks KnobDimmerController knobDimmerController;
+    @Mock private DeviceService deviceService;
 
-    @Mock DeviceService deviceService;
+    @Mock private KnobDimmerRepository inputRepository;
 
-    @Mock KnobDimmerRepository knobDimmerRepository;
+    @Mock private DimmableRepository outputRepository;
 
-    @Mock DeviceRepository inputRepository;
-
-    @Mock DeviceRepository outputRepository;
+    private KnobDimmerController knobDimmerController;
 
     @Mock private Principal mockPrincipal;
 
@@ -64,8 +56,9 @@ public class InputDeviceConnectionControllerTests {
         List l = new ArrayList<>();
         l.add(10L);
 
-        List toCheck = knobDimmerController.addLight(1L, l, mockPrincipal);
+        knobDimmerController =
+                new KnobDimmerController(inputRepository, outputRepository, deviceService);
 
-        assertEquals(l.get(0), toCheck.get(0));
+        assertDoesNotThrow(() -> knobDimmerController.addLight(1L, l, mockPrincipal));
     }
 }