Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
c614f96b31
43 changed files with 919 additions and 109 deletions
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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<AutomationFastUpdateRequest.ConditionDTO>
|
||||
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<Trigger<?>>)
|
||||
(src, typeOfSrc, context) -> context.serialize((Object) src));
|
||||
builder.registerTypeAdapter(
|
||||
Condition.class,
|
||||
(JsonSerializer<Condition<?>>)
|
||||
(src, typeOfSrc, context) -> context.serialize((Object) src));
|
||||
return builder;
|
||||
}
|
||||
|
||||
|
|
|
@ -61,8 +61,8 @@ import java.util.Map;
|
|||
* }
|
||||
* }</pre>
|
||||
*
|
||||
* This class addresses this problem by adding type information to the serialized JSON and honoring
|
||||
* that type information when the JSON is deserialized:
|
||||
* <p>This class addresses this problem by adding type information to the serialized JSON and
|
||||
* honoring that type information when the JSON is deserialized:
|
||||
*
|
||||
* <pre>{@code
|
||||
* {
|
||||
|
@ -82,12 +82,12 @@ import java.util.Map;
|
|||
* }
|
||||
* }</pre>
|
||||
*
|
||||
* Both the type field name ({@code "type"}) and the type labels ({@code "Rectangle"}) are
|
||||
* <p>Both the type field name ({@code "type"}) and the type labels ({@code "Rectangle"}) are
|
||||
* configurable.
|
||||
*
|
||||
* <h3>Registering Types</h3>
|
||||
*
|
||||
* Create a {@code RuntimeTypeAdapterFactory} by passing the base type and type field name to the
|
||||
* <p>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");
|
||||
* }</pre>
|
||||
*
|
||||
* Next register all of your subtypes. Every subtype must be explicitly registered. This protects
|
||||
* <p>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");
|
||||
* }</pre>
|
||||
*
|
||||
* Finally, register the type adapter factory in your application's GSON builder:
|
||||
* <p>Finally, register the type adapter factory in your application's GSON builder:
|
||||
*
|
||||
* <pre>{@code
|
||||
* Gson gson = new GsonBuilder()
|
||||
|
@ -114,7 +114,7 @@ import java.util.Map;
|
|||
* .create();
|
||||
* }</pre>
|
||||
*
|
||||
* Like {@code GsonBuilder}, this API supports chaining:
|
||||
* <p>Like {@code GsonBuilder}, this API supports chaining:
|
||||
*
|
||||
* <pre>{@code
|
||||
* RuntimeTypeAdapterFactory<Shape> shapeAdapterFactory = RuntimeTypeAdapterFactory.of(Shape.class)
|
||||
|
@ -125,7 +125,7 @@ import java.util.Map;
|
|||
*
|
||||
* <h3>Serialization and deserialization</h3>
|
||||
*
|
||||
* In order to serialize and deserialize a polymorphic object, you must specify the base type
|
||||
* <p>In order to serialize and deserialize a polymorphic object, you must specify the base type
|
||||
* explicitly.
|
||||
*
|
||||
* <pre>{@code
|
||||
|
@ -133,7 +133,7 @@ import java.util.Map;
|
|||
* String json = gson.toJson(diamond, Shape.class);
|
||||
* }</pre>
|
||||
*
|
||||
* And then:
|
||||
* <p>And then:
|
||||
*
|
||||
* <pre>{@code
|
||||
* Shape shape = gson.fromJson(json, Shape.class);
|
||||
|
@ -200,6 +200,38 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
|
|||
return this;
|
||||
}
|
||||
|
||||
private void initMaps(
|
||||
Gson gson,
|
||||
Map<String, TypeAdapter<?>> labelToDelegate,
|
||||
Map<Class<?>, TypeAdapter<?>> subtypeToDelegate) {
|
||||
for (Map.Entry<String, Class<?>> 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<String, JsonElement> e : jsonObject.entrySet()) {
|
||||
clone.add(e.getKey(), e.getValue());
|
||||
}
|
||||
Streams.write(clone, out);
|
||||
}
|
||||
|
||||
public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
|
||||
if (type.getRawType() != baseType) {
|
||||
return null;
|
||||
|
@ -209,12 +241,9 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
|
|||
new LinkedHashMap<>(labelToSubtype.size());
|
||||
final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate =
|
||||
new LinkedHashMap<>(labelToSubtype.size());
|
||||
for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
|
||||
TypeAdapter<?> delegate =
|
||||
gson.getDelegateAdapter(this, TypeToken.get(entry.getValue()));
|
||||
labelToDelegate.put(entry.getKey(), delegate);
|
||||
subtypeToDelegate.put(entry.getValue(), delegate);
|
||||
}
|
||||
|
||||
initMaps(gson, labelToDelegate, subtypeToDelegate);
|
||||
final RuntimeTypeAdapterFactory<T> that = this;
|
||||
|
||||
return new TypeAdapter<R>() {
|
||||
@Override
|
||||
|
@ -267,21 +296,7 @@ public final class RuntimeTypeAdapterFactory<T> 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<String, JsonElement> e : jsonObject.entrySet()) {
|
||||
clone.add(e.getKey(), e.getValue());
|
||||
}
|
||||
Streams.write(clone, out);
|
||||
that.cloneObjectAndWrite(jsonObject, label, out, srcType);
|
||||
}
|
||||
}.nullSafe();
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@ public class AutomationController {
|
|||
@Autowired private AutomationRepository automationRepository;
|
||||
@Autowired private ScenePriorityRepository sceneRepository;
|
||||
@Autowired private TriggerRepository<Trigger<?>> triggerRepository;
|
||||
@Autowired private ConditionRepository<Condition<?>> conditionRepository;
|
||||
@Autowired private UserRepository userService;
|
||||
|
||||
@GetMapping
|
||||
|
@ -86,6 +87,7 @@ public class AutomationController {
|
|||
|
||||
triggerRepository.deleteAllByAutomationId(a.getId());
|
||||
sceneRepository.deleteAllByAutomationId(a.getId());
|
||||
conditionRepository.deleteAllByAutomationId(a.getId());
|
||||
|
||||
Iterable<Trigger<?>> tt =
|
||||
triggerRepository.saveAll(
|
||||
|
@ -99,22 +101,31 @@ 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()));
|
||||
|
||||
Iterable<Condition<?>> cc =
|
||||
conditionRepository.saveAll(
|
||||
req.getConditions()
|
||||
.stream()
|
||||
.map(AutomationFastUpdateRequest.ConditionDTO::toModel)
|
||||
.map(t -> t.setAutomationId(a.getId()))
|
||||
.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();
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -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<BooleanCondition> 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);
|
||||
}
|
||||
}
|
|
@ -25,11 +25,11 @@ public class BooleanTriggerController {
|
|||
@Autowired BooleanTriggerRepository booleanTriggerRepository;
|
||||
|
||||
@GetMapping("/{automationId}")
|
||||
public List<BooleanTrigger<?>> getAll(@PathVariable long automationId) {
|
||||
public List<BooleanTrigger> 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(
|
||||
|
|
|
@ -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<RangeCondition> 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);
|
||||
}
|
||||
}
|
|
@ -25,11 +25,11 @@ public class RangeTriggerController {
|
|||
@Autowired RangeTriggerRepository rangeTriggerRepository;
|
||||
|
||||
@GetMapping("/{automationId}")
|
||||
public List<RangeTrigger<?>> getAll(@PathVariable long automationId) {
|
||||
public List<RangeTrigger> 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(
|
||||
|
|
|
@ -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<State<?>> stateRepository;
|
||||
private final CameraConfigurationService cameraConfigurationService;
|
||||
|
||||
@Autowired
|
||||
public SecurityCameraController(
|
||||
DeviceService deviceService,
|
||||
SecurityCameraRepository securityCameraService,
|
||||
SceneRepository sceneRepository,
|
||||
StateRepository<State<?>> stateRepository) {
|
||||
StateRepository<State<?>> 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());
|
||||
}
|
||||
|
|
|
@ -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<ThermostatCondition> 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);
|
||||
}
|
||||
}
|
|
@ -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.findByConfirmToken(token.getConfirmToken())
|
||||
!= null);
|
||||
|
||||
confirmationTokenRepository.save(token);
|
||||
|
@ -135,8 +134,7 @@ public class UserAccountController {
|
|||
do {
|
||||
token = new ConfirmationToken(toReset);
|
||||
token.setResetPassword(true);
|
||||
} while (confirmationTokenRepository.findByConfirmationToken(token.getConfirmationToken())
|
||||
!= null);
|
||||
} while (confirmationTokenRepository.findByConfirmToken(token.getConfirmToken()) != null);
|
||||
|
||||
// Delete existing email password reset tokens
|
||||
confirmationTokenRepository.deleteByUserAndResetPassword(toReset, true);
|
||||
|
@ -158,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();
|
||||
|
@ -187,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);
|
||||
|
|
|
@ -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;
|
||||
|
@ -21,7 +26,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 +39,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);
|
||||
|
@ -57,8 +62,58 @@ public class AutomationFastUpdateRequest {
|
|||
}
|
||||
}
|
||||
|
||||
public abstract static class ConditionDTO {
|
||||
@NotNull public long deviceId;
|
||||
|
||||
public abstract Condition<?> toModel();
|
||||
}
|
||||
|
||||
public static 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 static 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 static 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<ScenePriorityDTO> scenes;
|
||||
@NotNull private List<TriggerDTO> triggers;
|
||||
@NotNull private List<ConditionDTO> 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<ConditionDTO> getConditions() {
|
||||
return conditions;
|
||||
}
|
||||
|
||||
public void setConditions(List<ConditionDTO> conditions) {
|
||||
this.conditions = conditions;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -33,6 +33,9 @@ public class Automation {
|
|||
@OneToMany(mappedBy = "automation", cascade = CascadeType.REMOVE)
|
||||
private Set<ScenePriority> scenes = new HashSet<>();
|
||||
|
||||
@OneToMany(mappedBy = "automation", orphanRemoval = true, cascade = CascadeType.REMOVE)
|
||||
private Set<Condition<?>> conditions = new HashSet<>();
|
||||
|
||||
@NotNull @NotEmpty private String name;
|
||||
|
||||
public long getId() {
|
||||
|
@ -74,4 +77,8 @@ public class Automation {
|
|||
public void setUserId(Long userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public Set<Condition<?>> getConditions() {
|
||||
return conditions;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,9 +7,9 @@ import org.springframework.data.repository.CrudRepository;
|
|||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
public interface AutomationRepository extends CrudRepository<Automation, Long> {
|
||||
@EntityGraph(attributePaths = {"scenes", "triggers"})
|
||||
@EntityGraph(attributePaths = {"scenes", "triggers", "conditions"})
|
||||
List<Automation> findAllByUserId(@Param("userId") long userId);
|
||||
|
||||
@EntityGraph(attributePaths = {"scenes", "triggers"})
|
||||
@EntityGraph(attributePaths = {"scenes", "triggers", "conditions"})
|
||||
Optional<Automation> findByIdAndUserId(@Param("id") long id, @Param("userId") long userId);
|
||||
}
|
||||
|
|
|
@ -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<BooleanTriggerable> {
|
||||
|
||||
@Column(name = "switchable_on")
|
||||
private boolean on;
|
||||
|
||||
public BooleanCondition() {
|
||||
super("booleanCondition");
|
||||
}
|
||||
|
||||
public boolean isOn() {
|
||||
return on;
|
||||
}
|
||||
|
||||
public void setOn(boolean on) {
|
||||
this.on = on;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean triggered() {
|
||||
return this.getDevice().readTriggerState() == isOn();
|
||||
}
|
||||
}
|
|
@ -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 BooleanConditionRepository extends ConditionRepository<BooleanCondition> {
|
||||
|
||||
List<BooleanCondition> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
}
|
|
@ -4,7 +4,7 @@ import javax.persistence.Column;
|
|||
import javax.persistence.Entity;
|
||||
|
||||
@Entity
|
||||
public class BooleanTrigger<D extends Device & BooleanTriggerable> extends Trigger<D> {
|
||||
public class BooleanTrigger extends Trigger<BooleanTriggerable> {
|
||||
|
||||
@Column(name = "switchable_on")
|
||||
private boolean on;
|
||||
|
|
|
@ -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<BooleanTrigger<? extends Device>> {
|
||||
public interface BooleanTriggerRepository extends TriggerRepository<BooleanTrigger> {
|
||||
|
||||
List<BooleanTrigger<?>> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
List<BooleanTrigger> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,95 @@
|
|||
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;
|
||||
|
||||
@Entity
|
||||
public abstract class Condition<D> {
|
||||
|
||||
@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(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)
|
||||
private Long deviceId;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "automation_id", updatable = false, insertable = false)
|
||||
@GsonExclude
|
||||
private Automation automation;
|
||||
|
||||
@Column(name = "automation_id", nullable = false)
|
||||
private Long automationId;
|
||||
|
||||
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<D> setAutomationId(Long automationId) {
|
||||
this.automationId = automationId;
|
||||
return this;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
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;
|
||||
|
||||
public interface ConditionRepository<T extends Condition<?>> extends CrudRepository<T, Long> {
|
||||
|
||||
List<T> findAllByDeviceId(@Param("deviceId") long deviceId);
|
||||
|
||||
List<T> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
|
||||
@Transactional
|
||||
void deleteAllByAutomationId(@Param("automationId") long automationId);
|
||||
}
|
|
@ -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) {
|
||||
|
|
|
@ -4,7 +4,7 @@ import javax.transaction.Transactional;
|
|||
import org.springframework.data.repository.CrudRepository;
|
||||
|
||||
public interface ConfirmationTokenRepository extends CrudRepository<ConfirmationToken, String> {
|
||||
ConfirmationToken findByConfirmationToken(String confirmationToken);
|
||||
ConfirmationToken findByConfirmToken(String confirmToken);
|
||||
|
||||
ConfirmationToken findByUser(User user);
|
||||
|
||||
|
|
|
@ -0,0 +1,69 @@
|
|||
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<RangeTriggerable> {
|
||||
|
||||
public RangeCondition() {
|
||||
super("rangeCondition");
|
||||
}
|
||||
|
||||
public enum Operator {
|
||||
@SerializedName("EQUAL")
|
||||
EQUAL,
|
||||
@SerializedName("LESS")
|
||||
LESS,
|
||||
@SerializedName("GREATER")
|
||||
GREATER,
|
||||
@SerializedName("LESS_EQUAL")
|
||||
LESS_EQUAL,
|
||||
@SerializedName("GREATER_EQUAL")
|
||||
GREATER_EQUAL
|
||||
}
|
||||
|
||||
@Column(nullable = false)
|
||||
private RangeCondition.Operator operator;
|
||||
|
||||
@NotNull
|
||||
@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();
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
public interface RangeConditionRepository extends ConditionRepository<RangeCondition> {
|
||||
List<RangeCondition> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
}
|
|
@ -5,7 +5,7 @@ import javax.persistence.Column;
|
|||
import javax.persistence.Entity;
|
||||
|
||||
@Entity
|
||||
public class RangeTrigger<D extends Device & RangeTriggerable> extends Trigger<D> {
|
||||
public class RangeTrigger extends Trigger<RangeTriggerable> {
|
||||
|
||||
public RangeTrigger() {
|
||||
super("rangeTrigger");
|
||||
|
|
|
@ -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<RangeTrigger<? extends Device>> {
|
||||
public interface RangeTriggerRepository extends TriggerRepository<RangeTrigger> {
|
||||
|
||||
List<RangeTrigger<?>> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
List<RangeTrigger> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
}
|
||||
|
|
|
@ -17,13 +17,16 @@ public class SecurityCamera extends Switchable implements BooleanTriggerable {
|
|||
private boolean on;
|
||||
|
||||
@Column(name = "video", nullable = false)
|
||||
@NotNull
|
||||
private String path = "/security_camera_videos/security_camera_1.mp4";
|
||||
private String path;
|
||||
|
||||
public String getPath() {
|
||||
return path;
|
||||
}
|
||||
|
||||
public void setPath(String path) {
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOn() {
|
||||
return on;
|
||||
|
|
|
@ -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<Thermostat> {
|
||||
|
||||
public ThermostatCondition() {
|
||||
super("thermostatCondition");
|
||||
}
|
||||
|
||||
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 getMode() {
|
||||
return mode;
|
||||
}
|
||||
|
||||
public void setMode(Thermostat.Mode mode) {
|
||||
this.mode = mode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean triggered() {
|
||||
switch (operator) {
|
||||
case EQUAL:
|
||||
return getDevice().getMode() == mode;
|
||||
case NOTEQUAL:
|
||||
return getDevice().getMode() != mode;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -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<ThermostatCondition> {
|
||||
|
||||
List<ThermostatCondition> findAllByAutomationId(@Param("automationId") long automationId);
|
||||
}
|
|
@ -6,7 +6,7 @@ import javax.persistence.*;
|
|||
|
||||
@Entity
|
||||
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
|
||||
public abstract class Trigger<D extends Device> {
|
||||
public abstract class Trigger<D> {
|
||||
|
||||
@Transient private String kind;
|
||||
|
||||
|
|
|
@ -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<Trigger<Device>> triggerRepository;
|
||||
|
||||
@Autowired
|
||||
public AutomationService(
|
||||
AutomationRepository automationRepository,
|
||||
TriggerRepository<Trigger<Device>> triggerRepository) {
|
||||
this.automationRepository = automationRepository;
|
||||
this.triggerRepository = triggerRepository;
|
||||
}
|
||||
|
||||
public List<Trigger<Device>> findTriggersByDeviceId(Long deviceId) {
|
||||
return triggerRepository.findAllByDeviceId(deviceId);
|
||||
}
|
||||
|
||||
public Automation findByVerifiedId(Long automationId) {
|
||||
return automationRepository.findById(automationId).orElseThrow();
|
||||
}
|
||||
}
|
|
@ -93,7 +93,7 @@ public class DevicePropagationService {
|
|||
Iterable<T> 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);
|
||||
}
|
||||
|
|
|
@ -16,35 +16,32 @@ import org.springframework.stereotype.Component;
|
|||
public class DeviceService {
|
||||
|
||||
private final DeviceRepository<Device> deviceRepository;
|
||||
private final AutomationRepository automationRepository;
|
||||
private final SceneRepository sceneRepository;
|
||||
private final SceneService sceneService;
|
||||
private final TriggerRepository<Trigger<? extends Device>> triggerRepository;
|
||||
private final RoomRepository roomRepository;
|
||||
private final AutomationService automationService;
|
||||
private final EagerUserRepository userRepository;
|
||||
private final DevicePopulationService devicePopulationService;
|
||||
private final DevicePropagationService devicePropagationService;
|
||||
private final ConditionRepository<Condition<?>> conditionRepository;
|
||||
|
||||
@Autowired
|
||||
public DeviceService(
|
||||
DeviceRepository<Device> deviceRepository,
|
||||
AutomationRepository automationRepository,
|
||||
SceneRepository sceneRepository,
|
||||
SceneService sceneService,
|
||||
TriggerRepository<Trigger<? extends Device>> triggerRepository,
|
||||
RoomRepository roomRepository,
|
||||
AutomationService automationService,
|
||||
EagerUserRepository userRepository,
|
||||
DevicePopulationService devicePopulationService,
|
||||
DevicePropagationService devicePropagationService) {
|
||||
DevicePropagationService devicePropagationService,
|
||||
ConditionRepository<Condition<?>> conditionRepository) {
|
||||
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;
|
||||
this.conditionRepository = conditionRepository;
|
||||
}
|
||||
|
||||
public void throwIfRoomNotOwned(Long roomId, String username) throws NotFoundException {
|
||||
|
@ -58,23 +55,25 @@ public class DeviceService {
|
|||
private void triggerTriggers(Device device, final String username) {
|
||||
|
||||
final long deviceId = device.getId();
|
||||
|
||||
List<Trigger<? extends Device>> triggers = triggerRepository.findAllByDeviceId(deviceId);
|
||||
final List<Trigger<Device>> triggers = automationService.findTriggersByDeviceId(deviceId);
|
||||
|
||||
triggers.stream()
|
||||
.filter(Trigger::triggered)
|
||||
.map(Trigger::getAutomationId)
|
||||
.map(t -> automationRepository.findById(t).orElseThrow(IllegalStateException::new))
|
||||
.map(automationService::findByVerifiedId)
|
||||
.distinct()
|
||||
.filter(
|
||||
a -> {
|
||||
final List<Condition<?>> conditions =
|
||||
conditionRepository.findAllByAutomationId(a.getId());
|
||||
if (conditions.size() == 0) return true;
|
||||
return conditions.stream().allMatch(Condition::triggered);
|
||||
})
|
||||
.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));
|
||||
}
|
||||
|
||||
|
@ -86,6 +85,7 @@ 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();
|
||||
devicePropagationService.renameIfDuplicate(device, host.getUsername());
|
||||
|
||||
|
|
|
@ -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<State<?>> stateRepository;
|
||||
private final SceneRepository sceneRepository;
|
||||
|
||||
public Scene findByValidatedId(Long id) {
|
||||
return sceneRepository.findById(id).orElseThrow();
|
||||
}
|
||||
|
||||
@Autowired
|
||||
public SceneService(
|
||||
DevicePopulationService devicePopulationService,
|
||||
DevicePropagationService devicePropagationService,
|
||||
StateRepository<State<?>> stateRepository) {
|
||||
StateRepository<State<?>> stateRepository,
|
||||
SceneRepository sceneRepository) {
|
||||
this.devicePopulationService = devicePopulationService;
|
||||
this.devicePropagationService = devicePropagationService;
|
||||
this.stateRepository = stateRepository;
|
||||
this.sceneRepository = sceneRepository;
|
||||
}
|
||||
|
||||
private List<Device> copyStatesToDevices(Scene fromScene) {
|
||||
|
|
|
@ -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> T getEndpointInstance(Class<T> 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");
|
||||
|
|
|
@ -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
|
||||
email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
|
||||
camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
|
|
@ -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
|
||||
email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass
|
||||
camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
|
|
@ -49,7 +49,7 @@ public abstract class SmartHutTest {
|
|||
final ResponseEntity<Void> res3 =
|
||||
WebClient.create(getBaseURL())
|
||||
.get()
|
||||
.uri("/register/confirm-account?token=" + token.getConfirmationToken())
|
||||
.uri("/register/confirm-account?token=" + token.getConfirmToken())
|
||||
.retrieve()
|
||||
.toBodilessEntity()
|
||||
.block();
|
||||
|
|
|
@ -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
|
||||
email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
|
||||
camera.videoUrl="/security_camera_videos/security_camera_1.mp4"
|
Loading…
Reference in a new issue