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

Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 55-users-can-add-conditions-to-automations

Browse source
This commit is contained in:
Claudio Maggioni (maggicl) 2020-05-10 21:26:42 +02:00
commit 0ba0d10cdc
76 changed files with 910 additions and 797 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -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

13
build.gradle
View file

@ -1,8 +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 'java'
id 'jacoco'
id "org.sonarqube" version "2.8"
}
group = 'ch.usi.inf.sa4.sanmarinoes'
version = '0.0.1-SNAPSHOT'
@ -50,3 +51,13 @@ gradle.projectsEvaluated {
test {
useJUnitPlatform()
}
jacocoTestReport {
reports {
xml.enabled true
}
}
plugins.withType(JacocoPlugin) {
tasks["test"].finalizedBy 'jacocoTestReport'
}

4
gradle.properties Normal file
View file

@ -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

9
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CORSFilter.java
View file

@ -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");
@ -31,10 +32,4 @@ public class CORSFilter implements Filter {
chain.doFilter(req, res);
}
@Override
public void init(FilterConfig filterConfig) {}
@Override
public void destroy() {}
}

24
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/CameraConfigurationService.java Normal file
View file

@ -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;
}
}

32
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationService.java
View file

@ -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;
}
}

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTRequestFilter.java
View file

@ -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");

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/JWTTokenUtils.java
View file

@ -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}")
@ -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));
}

114
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/RuntimeTypeAdapterFactory.java
View file

@ -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;
@ -77,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
* {
@ -98,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.
*
@ -112,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.
*
@ -122,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()
@ -130,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)
@ -141,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
@ -149,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);
@ -158,8 +142,8 @@ import java.util.Map;
public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
private final Class<?> baseType;
private final String typeFieldName;
private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<String, Class<?>>();
private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<Class<?>, String>();
private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<>();
private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<>();
private final boolean maintainType;
private RuntimeTypeAdapterFactory(
@ -179,7 +163,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
*/
public static <T> RuntimeTypeAdapterFactory<T> of(
Class<T> baseType, String typeFieldName, boolean maintainType) {
return new RuntimeTypeAdapterFactory<T>(baseType, typeFieldName, maintainType);
return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName, maintainType);
}
/**
@ -187,7 +171,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
* the type field name. Type field names are case sensitive.
*/
public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName) {
return new RuntimeTypeAdapterFactory<T>(baseType, typeFieldName, false);
return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName, false);
}
/**
@ -195,7 +179,7 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
* field name.
*/
public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType) {
return new RuntimeTypeAdapterFactory<T>(baseType, "type", false);
return new RuntimeTypeAdapterFactory<>(baseType, "type", false);
}
/**
@ -216,15 +200,36 @@ public final class RuntimeTypeAdapterFactory<T> 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<T> registerSubtype(Class<? extends T> type) {
return registerSubtype(type, type.getSimpleName());
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) {
@ -233,19 +238,16 @@ public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
}
final Map<String, TypeAdapter<?>> labelToDelegate =
new LinkedHashMap<String, TypeAdapter<?>>();
new LinkedHashMap<>(labelToSubtype.size());
final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate =
new LinkedHashMap<Class<?>, TypeAdapter<?>>();
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);
}
new LinkedHashMap<>(labelToSubtype.size());
initMaps(gson, labelToDelegate, subtypeToDelegate);
final RuntimeTypeAdapterFactory<T> that = this;
return new TypeAdapter<R>() {
@Override
public R read(JsonReader in) throws IOException {
public R read(JsonReader in) {
JsonElement jsonElement = Streams.parse(in);
JsonElement labelJsonElement;
if (maintainType) {
@ -294,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();
}

10
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AuthenticationController.java
View file

@ -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);
}
}
}

13
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/AutomationController.java
View file

@ -34,8 +34,7 @@ public class AutomationController {
@GetMapping
public List<Automation> 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);
}
@ -102,7 +101,6 @@ public class AutomationController {
req.getScenes()
.stream()
.map(AutomationFastUpdateRequest.ScenePriorityDTO::toModel)
.map(t -> t.setAutomationId(a.getId()))
.collect(Collectors.toList()));
Iterable<Condition<?>> cc =
@ -113,6 +111,15 @@ public class AutomationController {
.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();

10
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/BooleanTriggerController.java
View file

@ -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(

14
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
View file

@ -26,7 +26,7 @@ public class ButtonDimmerController
ButtonDimmerRepository inputRepository,
DimmableRepository<Dimmable> outputRepository,
DeviceService deviceService) {
super(inputRepository, outputRepository, DimmableLight.BUTTON_DIMMER_DIMMABLE_CONNECTOR);
super(inputRepository, outputRepository);
this.deviceService = deviceService;
this.buttonDimmerRepository = inputRepository;
}
@ -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());

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

@ -64,8 +64,8 @@ public class CurtainsController {
.findByIdAndUsername(deviceId, principal.getName())
.orElseThrow(NotFoundException::new);
State<? extends Dimmable> 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);

10
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DeviceController.java
View file

@ -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());

30
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java
View file

@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/dimmableLight")
public class DimmableLightController extends GuestEnabledController<DimmableLight> {
private DimmableLightRepository dimmableLightRepository;
private SceneRepository sceneRepository;
private StateRepository<State<?>> stateRepository;
private DeviceService deviceService;
private final DimmableLightRepository dimmableLightRepository;
private final SceneRepository sceneRepository;
private final StateRepository<State<?>> stateRepository;
private final DeviceService deviceService;
@Autowired
public DimmableLightController(
@ -49,10 +49,10 @@ public class DimmableLightController extends GuestEnabledController<DimmableLigh
}
}
/*
Assume that only the host can create a device
Here save always as host, but remember to propagate change to guests (DeviceService.saveAsOwner())
*/
/**
* Assume that only the host can create a device Here save always as host, but remember to
* propagate change to guests (DeviceService.saveAsOwner())
*/
@PostMapping
public DimmableLight create(
@Valid @RequestBody DimmableSaveRequest dl, final Principal principal)
@ -61,9 +61,7 @@ public class DimmableLightController extends GuestEnabledController<DimmableLigh
return save(new DimmableLight(), dl, principal.getName(), null);
}
/*
Logic for saving either as owner or guest is handled in method save of this controller
*/
/** Logic for saving either as owner or guest is handled in method save of this controller */
@PutMapping
public DimmableLight update(
@Valid @RequestBody DimmableSaveRequest sp,
@ -84,8 +82,10 @@ public class DimmableLightController extends GuestEnabledController<DimmableLigh
deviceService.deleteByIdAsOwner(id, principal.getName());
}
// the full url should be: "/dimmableLight/{id}/state?sceneId={sceneId}
// however it is not necessary to specify the query in the mapping
/**
* the full url should be: "/dimmableLight/{id}/state?sceneId={sceneId} however it is not
* necessary to specify the query in the mapping
*/
@PostMapping("/{id}/state")
public State<? extends Dimmable> sceneBinding(
@PathVariable("id") long deviceId,
@ -98,8 +98,8 @@ public class DimmableLightController extends GuestEnabledController<DimmableLigh
.findByIdAndUsername(deviceId, principal.getName())
.orElseThrow(NotFoundException::new);
State<? extends Dimmable> 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);

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

@ -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<User> setGuests(
@RequestBody @Valid GuestsUpdateRequest g, final Principal principal)
throws NotFoundException {
@RequestBody @Valid GuestsUpdateRequest g, final Principal principal) {
Iterable<User> guests = userRepository.findAllById(g.ids);
User host = userRepository.findByUsername(principal.getName());

48
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/InputDeviceConnectionController.java
View file

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
* @param <O> the output device attached to I
*/
public abstract class InputDeviceConnectionController<
I extends InputDevice, O extends OutputDevice> {
I extends InputDevice & Connectable<O>, O extends OutputDevice> {
private class Connection {
private final I input;
@ -33,30 +33,40 @@ public abstract class InputDeviceConnectionController<
this.input = input;
this.outputs = outputs;
}
public I getInput() {
return input;
}
public List<O> getOutputs() {
return outputs;
}
}
protected DeviceRepository<I> getInputRepository() {
return inputRepository;
}
protected DeviceRepository<O> getOutputReposiory() {
return outputReposiory;
}
@Autowired private DeviceService deviceService;
private DeviceRepository<I> inputRepository;
private final DeviceRepository<I> inputRepository;
private DeviceRepository<O> outputReposiory;
private Connector<I, O> connector;
private final DeviceRepository<O> 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<I> inputRepository,
DeviceRepository<O> outputRepository,
Connector<I, O> connector) {
DeviceRepository<I> inputRepository, DeviceRepository<O> outputRepository) {
this.inputRepository = inputRepository;
this.outputReposiory = outputRepository;
this.connector = connector;
}
private Connection checkConnectionIDs(Long inputId, List<Long> outputs, String username)
@ -65,7 +75,7 @@ public abstract class InputDeviceConnectionController<
inputRepository
.findByIdAndUsername(inputId, username)
.orElseThrow(() -> new NotFoundException("input device"));
final List<O> outputDevices = new ArrayList<>();
final List<O> outputDevices = new ArrayList<>(outputs.size());
for (final Long outputId : outputs) {
outputDevices.add(
outputReposiory
@ -87,12 +97,12 @@ public abstract class InputDeviceConnectionController<
Long inputId, List<Long> 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()) {
pair.getInput().connect(o, true);
}
deviceService.saveAllAsOwner(pair.outputs, username);
return pair.input.getOutputs();
deviceService.saveAllAsOwner(pair.getOutputs(), username);
return pair.getInput().getOutputs();
}
/**
@ -107,12 +117,12 @@ public abstract class InputDeviceConnectionController<
Long inputId, List<Long> 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()) {
pair.getInput().connect(o, false);
}
deviceService.saveAllAsOwner(pair.outputs, username);
return pair.input.getOutputs();
deviceService.saveAllAsOwner(pair.getOutputs(), username);
return pair.getInput().getOutputs();
}
@PostMapping("/{id}/lights")

11
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
View file

@ -17,14 +17,17 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/knobDimmer")
public class KnobDimmerController extends InputDeviceConnectionController<KnobDimmer, Dimmable> {
@Autowired private DeviceService deviceService;
@Autowired private KnobDimmerRepository knobDimmerRepository;
private final DeviceService deviceService;
private final KnobDimmerRepository knobDimmerRepository;
@Autowired
protected KnobDimmerController(
KnobDimmerRepository inputRepository, DimmableRepository<Dimmable> outputRepository) {
super(inputRepository, outputRepository, Dimmable.KNOB_DIMMER_DIMMABLE_CONNECTOR);
KnobDimmerRepository inputRepository,
DimmableRepository<Dimmable> outputRepository,
DeviceService deviceService) {
super(inputRepository, outputRepository);
this.knobDimmerRepository = inputRepository;
this.deviceService = deviceService;
}
@GetMapping("/{id}")

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

@ -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(

10
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RangeTriggerController.java
View file

@ -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(

6
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java
View file

@ -97,8 +97,6 @@ public class RegularLightController extends GuestEnabledController<RegularLight>
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<? extends Switchable> sceneBinding(
@PathVariable("id") long deviceId,
@ -110,8 +108,8 @@ public class RegularLightController extends GuestEnabledController<RegularLight>
.findByIdAndUsername(deviceId, principal.getName())
.orElseThrow(NotFoundException::new);
State<? extends Switchable> 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);

29
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java
View file

@ -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 <T> List<T> fetchOwnerOrGuest(
final List<T> list, Long hostId, final Principal principal) throws NotFoundException {

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

@ -24,10 +24,8 @@ public class ScenePriorityController {
@Autowired ScenePriorityRepository scenePriorityRepository;
@GetMapping("/{automationId}")
public List<ScenePriority> getByAutomationId(@PathVariable long automationId)
throws NotFoundException {
public List<ScenePriority> getByAutomationId(@PathVariable long automationId) {
return scenePriorityRepository.findAllByAutomationId(automationId);
}

29
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SecurityCameraController.java
View file

@ -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;
@ -22,18 +23,32 @@ 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<State<?>> stateRepository;
private final CameraConfigurationService cameraConfigurationService;
@Autowired private DeviceService deviceService;
@Autowired private SecurityCameraRepository securityCameraService;
@Autowired private SceneRepository sceneRepository;
@Autowired private StateRepository<State<?>> stateRepository;
@Autowired private RoomRepository roomRepository;
@Autowired
public SecurityCameraController(
DeviceService deviceService,
SecurityCameraRepository securityCameraService,
SceneRepository sceneRepository,
StateRepository<State<?>> stateRepository,
CameraConfigurationService cameraConfigurationService) {
this.deviceService = deviceService;
this.securityCameraService = securityCameraService;
this.sceneRepository = sceneRepository;
this.stateRepository = stateRepository;
this.cameraConfigurationService = cameraConfigurationService;
}
private SecurityCamera save(
SecurityCamera newSC, SwitchableSaveRequest sc, final Principal principal) {
newSC.setName(sc.getName());
newSC.setRoomId(sc.getRoomId());
newSC.setOn(sc.isOn());
newSC.setPath(cameraConfigurationService.getVideoUrl());
return deviceService.saveAsOwner(newSC, principal.getName());
}
@ -76,8 +91,8 @@ public class SecurityCameraController {
.findByIdAndUsername(deviceId, principal.getName())
.orElseThrow(NotFoundException::new);
State<? extends Switchable> 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);

17
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java
View file

@ -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)

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

@ -78,8 +78,8 @@ public class SmartPlugController {
.findByIdAndUsername(deviceId, principal.getName())
.orElseThrow(NotFoundException::new);
State<? extends Switchable> 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);

7
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
View file

@ -17,9 +17,8 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/switch")
public class SwitchController extends InputDeviceConnectionController<Switch, Switchable> {
private SwitchRepository switchRepository;
private SwitchableRepository<Switchable> switchableRepository;
private DeviceService deviceService;
private final SwitchRepository switchRepository;
private final DeviceService deviceService;
/**
* Contstructs the controller by requiring essential object for the controller implementation
@ -32,7 +31,7 @@ public class SwitchController extends InputDeviceConnectionController<Switch, Sw
SwitchRepository inputRepository,
SwitchableRepository<Switchable> outputRepository,
DeviceService deviceService) {
super(inputRepository, outputRepository, Switchable.SWITCH_SWITCHABLE_CONNECTOR);
super(inputRepository, outputRepository);
this.deviceService = deviceService;
this.switchRepository = inputRepository;
}

12
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
View file

@ -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<State<?>> stateRepository;
@ -30,14 +30,12 @@ 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);
newT.setOn(t.isTurnOn());
newT = deviceService.saveAsOwner(newT, principal.getName());
return newT;
return deviceService.saveAsOwner(newT, principal.getName());
}
@PostMapping
@ -76,8 +74,8 @@ public class ThermostatController {
.findByIdAndUsername(deviceId, principal.getName())
.orElseThrow(NotFoundException::new);
State<? extends Switchable> 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);

30
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/UserAccountController.java
View file

@ -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;
@ -65,7 +64,7 @@ public class UserAccountController {
+ (isRegistration
? emailConfig.getRegistrationPath()
: emailConfig.getResetPasswordPath())
+ token.getConfirmationToken());
+ token.getConfirmToken());
emailSenderService.sendEmail(mailMessage);
}
@ -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());
@ -105,15 +104,12 @@ public class UserAccountController {
ConfirmationToken token;
do {
token = new ConfirmationToken(toSave);
} while (confirmationTokenRepository.findByConfirmationToken(
token.getConfirmationToken())
} while (confirmationTokenRepository.findByConfirmToken(token.getConfirmToken())
!= null);
confirmationTokenRepository.save(token);
sendEmail(toSave.getEmail(), token, true);
return new OkResponse();
}
}
@ -125,7 +121,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());
@ -138,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);
@ -148,8 +143,6 @@ public class UserAccountController {
confirmationTokenRepository.save(token);
sendEmail(toReset.getEmail(), token, false);
return new OkResponse();
}
/**
@ -160,13 +153,10 @@ public class UserAccountController {
* @throws EmailTokenNotFoundException if given token is not a valid token for password reset
*/
@PutMapping("/reset-password")
public OkResponse 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());
confirmationTokenRepository.findByConfirmToken(resetRequest.getConfirmationToken());
if (token == null || !token.getResetPassword()) {
throw new EmailTokenNotFoundException();
@ -178,8 +168,6 @@ public class UserAccountController {
// Delete token to prevent further password changes
confirmationTokenRepository.delete(token);
return new OkResponse();
}
/**
@ -196,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);

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/AutomationFastUpdateRequest.java
View file

@ -26,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;
@ -39,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);

6
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/OkResponse.java
View file

@ -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;
}

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SceneSaveRequest.java
View file

@ -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 {

12
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/UserResponse.java
View file

@ -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;
}
}

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/error/UnauthorizedException.java
View file

@ -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;
}

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java
View file

@ -46,10 +46,6 @@ public class Automation {
this.id = id;
}
public Set<Trigger<?>> getStates() {
return triggers;
}
public Set<ScenePriority> getScenes() {
return scenes;
}

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

@ -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;

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/BooleanTriggerRepository.java
View file

@ -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);
}

22
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
View file

@ -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;
@ -32,12 +32,12 @@ public class ConfirmationToken {
private User user;
@Column(nullable = false)
private Boolean resetPassword;
private boolean resetPassword;
public ConfirmationToken(User user) {
this.user = user;
createdDate = new Date();
confirmationToken = UUID.randomUUID().toString();
confirmToken = UUID.randomUUID().toString();
resetPassword = false;
}
@ -48,12 +48,12 @@ public class ConfirmationToken {
return id;
}
public String getConfirmationToken() {
return confirmationToken;
public String getConfirmToken() {
return confirmToken;
}
public Date getCreatedDate() {
return createdDate;
return (Date) createdDate.clone();
}
public User getUser() {
@ -64,23 +64,23 @@ 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) {
this.createdDate = createdDate;
this.createdDate = (Date) createdDate.clone();
}
public void setUser(User user) {
this.user = user;
}
public Boolean getResetPassword() {
public boolean getResetPassword() {
return resetPassword;
}
public void setResetPassword(Boolean resetPassword) {
public void setResetPassword(boolean resetPassword) {
this.resetPassword = resetPassword;
}
}

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

@ -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);

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connectable.java Normal file
View file

@ -0,0 +1,5 @@
package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
public interface Connectable<O extends OutputDevice> {
void connect(O output, boolean connect);
}

47
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Connector.java
View file

@ -1,47 +0,0 @@
package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.Function;
/**
* A rule on how to connect an input device type to an output device type
*
* @param <I> the input device type
* @param <O> the output device type
*/
@FunctionalInterface
public interface Connector<I extends InputDevice, O extends OutputDevice> {
/**
* 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 <J> the input device type
* @param <K> the output device type
* @return a Connector implementation for the pair of types J and K
*/
static <J extends InputDevice, K extends OutputDevice> Connector<J, K> basic(
Function<J, Set<? super K>> outputsGetter, Function<K, Set<? super J>> 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);
}
};
}
}

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Curtains.java
View file

@ -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 {

98
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Device.java
View file

@ -4,10 +4,8 @@ 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.*;
import javax.validation.constraints.NotNull;
/** Generic abstraction for a smart home device */
@Entity
@ -39,18 +37,16 @@ public abstract class Device {
@OneToMany(mappedBy = "device", orphanRemoval = true)
@GsonExclude
@SocketGsonExclude
private Set<Trigger<? extends Device>> triggers = new HashSet<>();
private Set<Trigger<? extends Device>> triggers;
/**
* The room this device belongs in, as a foreign key id. To use when updating and inserting from
* 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;
@ -69,7 +65,7 @@ public abstract class Device {
@OneToMany(mappedBy = "device", orphanRemoval = true)
@GsonExclude
@SocketGsonExclude
private Set<State<?>> states = new HashSet<>();
private Set<State<?>> states;
@Transient @GsonExclude private Long fromHostId = null;
@ -77,28 +73,9 @@ public abstract class Device {
@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() {
@ -109,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<Trigger<? extends Device>> getTriggers() {
return triggers;
}
public void setTriggers(Set<Trigger<? extends Device>> triggers) {
this.triggers = triggers;
}
public Long getRoomId() {
@ -125,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<State<?>> getStates() {
return states;
}
public void setStates(Set<State<?>> 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;
}
}

6
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java
View file

@ -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<KnobDimmer, Dimmable> KNOB_DIMMER_DIMMABLE_CONNECTOR =
Connector.basic(KnobDimmer::getOutputs, Dimmable::getDimmers);
public static final Connector<ButtonDimmer, Dimmable> BUTTON_DIMMER_DIMMABLE_CONNECTOR =
Connector.basic(ButtonDimmer::getOutputs, Dimmable::getDimmers);
protected Dimmable(String kind) {
super(kind);
}

3
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableRepository.java
View file

@ -1,4 +1,3 @@
package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
public interface DimmableRepository<T extends Dimmable> extends SwitchableRepository<T> {
}
public interface DimmableRepository<T extends Dimmable> extends SwitchableRepository<T> {}

12
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmer.java
View file

@ -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<Dimmable> {
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);
}
}
}

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTrigger.java
View file

@ -3,10 +3,9 @@ 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<D extends Device & RangeTriggerable> extends Trigger<D> {
public class RangeTrigger extends Trigger<RangeTriggerable> {
public RangeTrigger() {
super("rangeTrigger");
@ -43,11 +42,9 @@ public class RangeTrigger<D extends Device & RangeTriggerable> extends Trigger<D
GREATER_EQUAL
}
@NotNull
@Column(nullable = false)
private Operator operator;
@NotNull
@Column(nullable = false)
private double range;

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RangeTriggerRepository.java
View file

@ -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);
}

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

@ -99,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;
}
}

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

@ -28,7 +28,6 @@ public class ScenePriority {
private Automation automation;
@Column(name = "automation_id", nullable = false)
@NotNull
private Long automationId;
@NotNull
@ -42,9 +41,12 @@ public class ScenePriority {
private Scene scene;
@Column(name = "scene_id", nullable = false, updatable = false)
@NotNull
private Long sceneId;
public long getId() {
return id;
}
public Integer getPriority() {
return priority;
}
@ -53,21 +55,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 +85,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;
}
}

6
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
View file

@ -18,12 +18,16 @@ 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;
}
public void setPath(String path) {
this.path = path;
}
@Override
public boolean isOn() {
return on;

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

@ -7,7 +7,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.NotNull;
/** A sensor input device that measures a quantity in a continuous scale (e.g. temperature) */
@Entity
@ -15,9 +14,9 @@ public class Sensor extends InputDevice implements RangeTriggerable {
public static final Map<SensorType, BigDecimal> 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() {
@ -45,7 +44,6 @@ public class Sensor extends InputDevice implements RangeTriggerable {
/** The type of this sensor */
@Column(nullable = false)
@NotNull
@Enumerated(value = EnumType.STRING)
private SensorType sensor;

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

@ -1,6 +1,5 @@
package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
import java.math.BigDecimal;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -20,7 +19,6 @@ public class SmartPlug extends Switchable implements BooleanTriggerable {
/** Whether the smart plug is on */
@Column(name = "smart_plug_on", nullable = false)
@NotNull
private boolean on;
public BigDecimal getTotalConsumption() {

13
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switch.java
View file

@ -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<Switchable> {
@ManyToMany(
cascade = {
@ -60,10 +60,21 @@ public class Switch extends InputDevice implements BooleanTriggerable {
return on;
}
@Override
public Set<Switchable> getOutputs() {
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;

3
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Switchable.java
View file

@ -11,9 +11,6 @@ import javax.persistence.*;
@Inheritance(strategy = InheritanceType.JOINED)
public abstract class Switchable extends OutputDevice {
public static final Connector<Switch, Switchable> SWITCH_SWITCHABLE_CONNECTOR =
Connector.basic(Switch::getOutputs, Switchable::getSwitches);
@ManyToMany(
mappedBy = "switchables",
cascade = {

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

@ -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
@ -66,7 +64,7 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
}
/** Temperature to be reached */
@Column @NotNull private BigDecimal targetTemperature;
@Column private BigDecimal targetTemperature;
/** The temperature detected by the embedded sensor */
@Column(nullable = false, precision = 4, scale = 1)

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ThermostatRepository.java
View file

@ -24,7 +24,6 @@ public interface ThermostatRepository extends DeviceRepository<Thermostat> {
* @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 = 'TEMPERATURE' AND r.id = ?1")
Optional<BigDecimal> getAverageTemperature(Long thermostatRoomId);
@Query("SELECT AVG(s.value) FROM Sensor s JOIN s.room r WHERE s.sensor = ?2 AND r.id = ?1")
Optional<BigDecimal> getAverageTemperature(Long thermostatRoomId, Sensor.SensorType sensorType);
}

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Trigger.java
View file

@ -3,11 +3,10 @@ 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;
@Entity
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
public abstract class Trigger<D extends Device> {
public abstract class Trigger<D> {
@Transient private String kind;
@ -37,7 +36,6 @@ public abstract class Trigger<D extends Device> {
* from a REST call.
*/
@Column(name = "device_id", nullable = false)
@NotNull
private Long deviceId;
@ManyToOne
@ -46,7 +44,6 @@ public abstract class Trigger<D extends Device> {
private Automation automation;
@Column(name = "automation_id", nullable = false)
@NotNull
private Long automationId;
public long getId() {

21
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java
View file

@ -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);
}
}

28
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/AutomationService.java Normal file
View file

@ -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();
}
}

20
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePopulationService.java Normal file
View file

@ -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 ThermostatPopulationService thermostatService;
public void populateComputedFields(Iterable<Device> devices) {
for (Device d : devices) {
if (d instanceof Thermostat) {
thermostatService.populateMeasuredTemperature((Thermostat) d);
}
}
}
}

151
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/DevicePropagationService.java Normal file
View file

@ -0,0 +1,151 @@
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 {
private final SensorSocketEndpoint endpoint;
private final EagerUserRepository userRepository;
private final DeviceRepository<Device> deviceRepository;
@Autowired
public DevicePropagationService(
SensorSocketEndpoint endpoint,
EagerUserRepository userRepository,
DeviceRepository<Device> deviceRepository) {
this.endpoint = endpoint;
this.userRepository = userRepository;
this.deviceRepository = deviceRepository;
}
void propagateUpdateAsGuest(Device device, User host, User guest) {
final Set<User> 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<Device> 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 extends Device> 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 <T> the type of device contained in the list
* @return the updated list of devices, ready to be fed to GSON
*/
public <T extends Device> List<T> saveAllAsOwner(
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));
return toList(devices);
}
public <T extends Device> List<T> saveAllAsOwner(Iterable<T> devices, String username) {
return saveAllAsOwner(devices, username, false, false);
}
public <T extends Device> 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<User> 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<User> 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);
}
}
}

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

@ -4,12 +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.ArrayList;
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;
@ -18,237 +15,91 @@ import org.springframework.stereotype.Component;
@Component
public class DeviceService {
@Autowired private DeviceRepository<Device> deviceRepository;
@Autowired private AutomationRepository automationRepository;
@Autowired private SceneRepository sceneRepository;
@Autowired private SceneService sceneService;
@Autowired private TriggerRepository<Trigger<? extends Device>> triggerRepository;
@Autowired private ConditionRepository<Condition<? extends Device>> conditionRepository;
@Autowired private RoomRepository roomRepository;
@Autowired private EagerUserRepository userRepository;
@Autowired private SensorSocketEndpoint endpoint;
@Autowired private ThermostatService thermostatService;
private final DeviceRepository<Device> deviceRepository;
private final SceneService sceneService;
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;
public void throwIfRoomNotOwned(Long roomId, String username) throws NotFoundException {
roomRepository.findByIdAndUsername(roomId, username).orElseThrow(NotFoundException::new);
@Autowired
public DeviceService(
DeviceRepository<Device> deviceRepository,
SceneService sceneService,
RoomRepository roomRepository,
AutomationService automationService,
EagerUserRepository userRepository,
DevicePopulationService devicePopulationService,
DevicePropagationService devicePropagationService,
ConditionRepository<Condition<?>> conditionRepository) {
this.deviceRepository = deviceRepository;
this.sceneService = sceneService;
this.roomRepository = roomRepository;
this.automationService = automationService;
this.userRepository = userRepository;
this.devicePopulationService = devicePopulationService;
this.devicePropagationService = devicePropagationService;
this.conditionRepository = conditionRepository;
}
private void renameIfDuplicate(Device toCreate, String username) {
while (deviceRepository.findDuplicates(toCreate.getName(), username)
- (toCreate.getId() <= 0 ? 0 : 1)
> 0) {
toCreate.setName(toCreate.getName() + " (new)");
}
public void throwIfRoomNotOwned(Long roomId, String username) throws NotFoundException {
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) {
final long deviceId = device.getId();
final List<Trigger<Device>> triggers = automationService.findTriggersByDeviceId(deviceId);
// find the conditions that this device state change is triggering
List<Condition<? extends Device>> triggeredConditions =
conditionRepository
.findAllByDeviceId(deviceId)
.stream()
.filter(Condition::triggered)
.collect(Collectors.toList());
List<Automation> 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<? extends Device> condition : triggeredConditions) {
Automation a =
automationRepository
.findById(condition.getAutomationId())
.orElseThrow(IllegalStateException::new);
List<Condition<? extends Device>> conditions =
conditionRepository.findAllByAutomationId(a.getId());
if (conditions.size()
== conditions
.stream()
.filter(Condition::triggered)
.collect(Collectors.toList())
.size()) {
automationsWithMetConditions.add(a);
}
}
List<Trigger<? extends Device>> triggers = triggerRepository.findAllByDeviceId(deviceId);
// 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<Automation> triggeredAutomationsTMP =
triggers.stream()
.filter(Trigger::triggered)
.map(Trigger::getAutomationId)
.map(
t ->
automationRepository
.findById(t)
.orElseThrow(IllegalStateException::new))
.distinct()
.collect(Collectors.toList());
List<Automation> 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()
triggers.stream()
.filter(Trigger::triggered)
.map(Trigger::getAutomationId)
.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))
.forEach((s) -> sceneService.apply(s, username, true));
.map(t -> sceneService.findByValidatedId(t.getSceneId()))
.forEach(s -> sceneService.apply(s, username, true));
}
public List<Device> findAll(Long hostId, String username) throws NotFoundException {
return findAll(null, hostId, username);
}
public List<Device> findAll(Long roomId, Long hostId, String username)
throws NotFoundException {
try {
Iterable<Device> 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<Device> devices) {
for (Device d : devices) {
if (d instanceof Thermostat) {
thermostatService.populateMeasuredTemperature((Thermostat) d);
}
}
}
public <T extends Device> T saveAsGuest(T device, String guestUsername, Long hostId)
throws NotFoundException {
final User currentUser = userRepository.findByUsername(guestUsername);
final User host = userRepository.findById(hostId).orElseThrow(NotFoundException::new);
if (!host.getGuests().contains(currentUser)) {
throw new NotFoundException();
}
renameIfDuplicate(device, host.getUsername());
if (!host.getGuests().contains(currentUser)) throw new NotFoundException();
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<User> 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<Device> saveAllAsGuestSceneApplication(
List<Device> 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<User> 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<Device> devices) {
devicePopulationService.populateComputedFields(devices);
}
/**
@ -269,15 +120,12 @@ public class DeviceService {
*/
public <T extends Device> List<T> saveAllAsOwner(
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));
List<T> 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 <T extends Device> List<T> saveAllAsOwner(Iterable<T> devices, String username) {
@ -285,29 +133,53 @@ public class DeviceService {
}
public <T extends Device> 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)
.orElseThrow(NotFoundException::new);
public List<Device> findAll(Long roomId, Long hostId, String username)
throws NotFoundException {
Iterable<Device> devices;
User host = null;
if (hostId == null) {
if (roomId != null) {
throwIfRoomNotOwned(roomId, username);
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<User> 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);
return filterOutCamerasIfNeeded(host, devices);
}
private List<Device> filterOutCamerasIfNeeded(User host, Iterable<Device> devices) {
if (host != null && !host.isCameraEnabled()) {
return StreamSupport.stream(devices.spliterator(), true)
.filter(d -> !(d instanceof SecurityCamera))
.collect(Collectors.toList());
} else {
return toList(devices);
}
}
}

5
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/JWTUserDetailsService.java
View file

@ -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;
@ -16,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(

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

@ -9,31 +9,48 @@ import org.springframework.stereotype.Component;
@Component
public class SceneService {
@Autowired private DeviceRepository<Device> deviceRepository;
@Autowired private DeviceService deviceService;
@Autowired private StateRepository<State<?>> stateRepository;
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,
SceneRepository sceneRepository) {
this.devicePopulationService = devicePopulationService;
this.devicePropagationService = devicePropagationService;
this.stateRepository = stateRepository;
this.sceneRepository = sceneRepository;
}
private List<Device> copyStatesToDevices(Scene fromScene) {
final List<Device> updated = new ArrayList<>();
final List<Device> 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<Device> apply(Scene newScene, String username, boolean fromTrigger) {
List<Device> updated = copyStatesToDevices(newScene);
deviceService.saveAllAsOwner(updated, username, true, fromTrigger);
devicePropagationService.saveAllAsOwner(updated, username, true, fromTrigger);
return updated;
}
public List<Device> applyAsGuest(Scene newScene, String username, Long hostId) {
List<Device> updated = copyStatesToDevices(newScene);
deviceService.saveAllAsGuestSceneApplication(updated, username, hostId);
devicePropagationService.saveAllAsGuestSceneApplication(updated, username, hostId);
return updated;
}

34
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatPopulationService.java Normal file
View file

@ -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<BigDecimal> 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));
}
}

24
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
View file

@ -18,6 +18,8 @@ public class ThermostatService {
@Autowired private DeviceService deviceService;
@Autowired private ThermostatPopulationService thermostatPopulationService;
@Autowired private ThermostatRepository thermostatRepository;
private void randomJitter(Thermostat thermostat) {
@ -41,12 +43,12 @@ public class ThermostatService {
public List<Thermostat> findAll(String username) {
Iterable<Thermostat> 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,25 +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<BigDecimal> average;
if (thermostat.isUseExternalSensors()) {
average = thermostatRepository.getAverageTemperature(thermostat.getRoomId());
} else {
return thermostat.getInternalSensorTemperature();
}
return average.orElse(null);
}
public void populateMeasuredTemperature(Thermostat thermostat) {
thermostat.setMeasuredTemperature(measureTemperature(thermostat));
}
}

7
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketConfig.java
View file

@ -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 instance = (T) this.instance;
return instance;
//noinspection unchecked
return (T) this.instance;
} catch (ClassCastException e) {
final var e2 =
new InstantiationException("Cannot cast SensorSocketEndpoint to desired type");

25
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
View file

@ -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;
@ -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,15 +22,17 @@ import org.springframework.stereotype.Component;
@Component
public class SensorSocketEndpoint extends Endpoint {
private Gson gson = GsonConfig.socketGson();
private static final Logger logger = LoggerFactory.getLogger(SensorSocketEndpoint.class);
@Autowired private DeviceService deviceService;
private final Gson gson = GsonConfig.socketGson();
private UserRepository userRepository;
@Autowired private DevicePopulationService deviceService;
private JWTTokenUtils jwtTokenUtils;
private final UserRepository userRepository;
private Multimap<User, Session> authorizedClients =
private final JWTTokenUtils jwtTokenUtils;
private final Multimap<User, Session> authorizedClients =
Multimaps.synchronizedMultimap(HashMultimap.create());
// messages are now stored as strings as a "hack" to capture and clone the state of the device,
@ -98,7 +102,7 @@ public class SensorSocketEndpoint extends Endpoint {
authorizedClients.remove(u, s);
}
} catch (IOException e) {
e.printStackTrace();
logger.warn(e.getLocalizedMessage(), e);
}
}
}
@ -118,7 +122,8 @@ public class SensorSocketEndpoint extends Endpoint {
} else {
try {
session.close();
} catch (IOException ignored) {
} catch (IOException e) {
logger.warn(e.getLocalizedMessage(), e);
}
}
}
@ -128,8 +133,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;
}

1
src/main/resources/application-dev.properties
View file

@ -33,3 +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"

1
src/main/resources/application-prod.properties
View file

@ -40,3 +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"

141
src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/AuthenticationTests.java
View file

@ -4,9 +4,7 @@ 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;
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.ConfirmationTokenRepository;
import ch.usi.inf.sa4.sanmarinoes.smarthut.models.UserRepository;
@ -42,10 +40,10 @@ public class AuthenticationTests extends SmartHutTest {
@Override
protected void setUp() {
final ResponseEntity<OkResponse> res =
final ResponseEntity<Object> res =
this.restTemplate.postForEntity(
this.url("/register"), getDisabledUser(), OkResponse.class);
assertThat(res.getStatusCode().equals(HttpStatus.OK));
this.url("/register"), getDisabledUser(), Object.class);
assertThat(res.getStatusCode()).isEqualTo(HttpStatus.OK);
registerTestUser(restTemplate, userRepository, tokenRepository);
}
@ -55,10 +53,11 @@ public class AuthenticationTests extends SmartHutTest {
final Map<String, Object> 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
@ -71,12 +70,15 @@ public class AuthenticationTests extends SmartHutTest {
final ResponseEntity<JsonObject> 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
@ -89,12 +91,15 @@ public class AuthenticationTests extends SmartHutTest {
final ResponseEntity<JsonObject> 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
@ -106,12 +111,15 @@ public class AuthenticationTests extends SmartHutTest {
final ResponseEntity<JsonObject> 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
@ -123,51 +131,15 @@ public class AuthenticationTests extends SmartHutTest {
final ResponseEntity<JsonObject> 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<DuplicateRegistrationException> 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<DuplicateRegistrationException> 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<DuplicateRegistrationException> 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
@ -178,10 +150,9 @@ public class AuthenticationTests extends SmartHutTest {
request.setEmail("smarthut.sm@example.com");
request.setPassword("password");
final ResponseEntity<OkResponse> res =
this.restTemplate.postForEntity(url("/register"), request, OkResponse.class);
assertThat(res.getStatusCode().equals(HttpStatus.OK));
assertThat(res.getBody() != null);
final ResponseEntity<Object> res =
this.restTemplate.postForEntity(url("/register"), request, Object.class);
assertThat(res.getStatusCode()).isEqualTo(HttpStatus.OK);
}
@Test
@ -189,10 +160,11 @@ public class AuthenticationTests extends SmartHutTest {
final Map<String, Object> 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
@ -204,9 +176,9 @@ public class AuthenticationTests extends SmartHutTest {
final ResponseEntity<UnauthorizedException> 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
@ -218,22 +190,7 @@ public class AuthenticationTests extends SmartHutTest {
final ResponseEntity<UnauthorizedException> 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<JWTResponse> 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();
}
}

16
src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmartHutTest.java
View file

@ -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;
@ -15,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/";
@ -40,9 +39,9 @@ public abstract class SmartHutTest {
final TestRestTemplate restTemplate,
final UserRepository userRepository,
final ConfirmationTokenRepository tokenRepository) {
final ResponseEntity<OkResponse> res2 =
restTemplate.postForEntity(this.url("/register"), enabledUser, OkResponse.class);
assertThat(res2.getStatusCode().equals(HttpStatus.OK));
final ResponseEntity<Object> res2 =
restTemplate.postForEntity(this.url("/register"), enabledUser, Object.class);
assertThat(res2.getStatusCode()).isEqualTo(HttpStatus.OK);
final User persistedEnabledUser = userRepository.findByUsername("enabled");
final ConfirmationToken token = tokenRepository.findByUser(persistedEnabledUser);
@ -50,13 +49,14 @@ 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();
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

9
src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/SmarthutApplicationTests.java
View file

@ -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);
}
}

1
src/test/resources/application.properties
View file

@ -35,3 +35,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"