Fixed smaal errors @tommi27 implementation. Fixed precision and scale values or total precision. Optimized update by using JPQL

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

@@ -5,6 +5,7 @@ import static ch.usi.inf.sa4.sanmarinoes.smarthut.utils.Utils.toList;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.dto.SmartPlugSaveRequest;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.error.NotFoundException;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import java.security.Principal;
 import java.util.*;
 import java.util.List;
 import javax.validation.Valid;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @EnableAutoConfiguration
-@RequestMapping("/smartplug")
+@RequestMapping("/smartPlug")
 public class SmartPlugController {
 
     @Autowired private SmartPlugRepository smartPlugRepository;
@@ -49,6 +50,18 @@ public class SmartPlugController {
                 smartPlugRepository.findById(sp.getId()).orElseThrow(NotFoundException::new), sp);
     }
 
+    @DeleteMapping("/{id}/meter")
+    public SmartPlug resetMeter(@PathVariable("id") long id, final Principal principal)
+            throws NotFoundException {
+        final SmartPlug s =
+                smartPlugRepository
+                        .findByIdAndUsername(id, principal.getName())
+                        .orElseThrow(NotFoundException::new);
+
+        s.resetTotalConsumption();
+        return smartPlugRepository.save(s);
+    }
+
     @DeleteMapping("/{id}")
     public void deleteById(@PathVariable("id") long id) {
         smartPlugRepository.deleteById(id);

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

@@ -36,7 +36,7 @@ public abstract class Device {
      * 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, unique = true)
+    @Column(name = "room_id", nullable = false)
     @NotNull
     private Long roomId;
 

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

@@ -35,7 +35,7 @@ public class Sensor extends InputDevice {
     }
 
     /** The value of this sensor according to its sensor type */
-    @Column(nullable = false, length = 10, precision = 1)
+    @Column(nullable = false, precision = 11, scale = 1)
     private BigDecimal value;
 
     /** The type of this sensor */

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

@@ -1,8 +1,6 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.math.BigDecimal;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.validation.constraints.NotNull;
@@ -11,40 +9,26 @@ import javax.validation.constraints.NotNull;
 @Entity
 public class SmartPlug extends Switchable {
 
-    /** The total amount of power that the smart plug has consumed represented in kW/h */
-    @Column @NotNull private static double totalConsumption;
+    /** The average consumption of an active plug when on in Watt */
+    public static final Double AVERAGE_CONSUMPTION_KW = 200.0;
+
+    /** The total amount of power that the smart plug has consumed represented in W/h */
+    @Column(precision = 13, scale = 3)
+    @NotNull
+    private BigDecimal totalConsumption = BigDecimal.ZERO;
 
     /** Whether the smart plug is on */
     @Column(name = "smart_plug_on", nullable = false)
     @NotNull
     private boolean on;
 
-    public double getTotalConsumption() {
+    public BigDecimal getTotalConsumption() {
         return totalConsumption;
     }
 
+    /** Resets the consuption meter */
     public void resetTotalConsumption() {
-        totalConsumption = 0;
-    }
-
-    /**
-     * Updates the consumption of a smart plug storing it in kW/h assuming that an average smart
-     * plug consumes 3W and by computing the conversion from watts to kW/h
-     */
-    private static void updateTotalConsumption() {
-        double averageConsumption = 3;
-        totalConsumption += (averageConsumption / 1000) * (1 / 3600);
-    }
-
-    /** Calls updateTotalConsumption every second */
-    public void updateConsumptionOverTime() {
-        final ScheduledExecutorService executorService =
-                Executors.newSingleThreadScheduledExecutor();
-
-        while (isOn()) {
-            executorService.scheduleAtFixedRate(
-                    SmartPlug::updateTotalConsumption, 0, 1, TimeUnit.SECONDS);
-        }
+        totalConsumption = BigDecimal.ZERO;
     }
 
     @Override

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlugRepository.java

@@ -1,3 +1,24 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-public interface SmartPlugRepository extends SwitchableRepository<SmartPlug> {}
+import java.util.Collection;
+import javax.transaction.Transactional;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+public interface SmartPlugRepository extends SwitchableRepository<SmartPlug> {
+    @Transactional
+    Collection<SmartPlug> findByOn(boolean on);
+
+    /**
+     * Updates total consumption of all activated smart plugs by considering a load of
+     * fakeConsumption W. This query must be executed every second
+     *
+     * @see ch.usi.inf.sa4.sanmarinoes.smarthut.scheduled.UpdateTasks
+     * @param fakeConsumption the fake consumption in watts
+     */
+    @Modifying(clearAutomatically = true)
+    @Transactional
+    @Query(
+            "UPDATE SmartPlug s SET totalConsumption = s.totalConsumption + ?1 / 3600.0 WHERE s.on = true")
+    void updateTotalConsumption(Double fakeConsumption);
+}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/scheduled/UpdateTasks.java

@@ -2,10 +2,10 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.scheduled;
 
 import ch.usi.inf.sa4.sanmarinoes.smarthut.controller.MotionSensorController;
 import ch.usi.inf.sa4.sanmarinoes.smarthut.controller.SensorController;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.MotionSensorRepository;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.Sensor;
-import ch.usi.inf.sa4.sanmarinoes.smarthut.models.SensorRepository;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.models.*;
+import ch.usi.inf.sa4.sanmarinoes.smarthut.socket.SensorSocketEndpoint;
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.StreamSupport;
@@ -13,18 +13,25 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-/** Generates fake sensor (and motion sensor) updates as required by milestone one */
+/**
+ * Generates fake sensor (and motion sensor) and smart plug consumption updates as required by
+ * milestone one
+ */
 @Component
-public class SensorUpdateTasks {
+public class UpdateTasks {
 
     @Autowired private SensorRepository sensorRepository;
 
     @Autowired private MotionSensorRepository motionSensorRepository;
 
+    @Autowired private SmartPlugRepository smartPlugRepository;
+
     @Autowired private SensorController sensorController;
 
     @Autowired private MotionSensorController motionSensorController;
 
+    @Autowired private SensorSocketEndpoint sensorSocketEndpoint;
+
     /** Generates fake sensor updates every two seconds with a +/- 1.25% error */
     @Scheduled(fixedRate = 2000)
     public void sensorFakeUpdate() {
@@ -59,4 +66,12 @@ public class SensorUpdateTasks {
                                                                     sensor, false));
                         });
     }
+
+    /** Updates power consumption of all activated smart plugs every second */
+    @Scheduled(fixedDelay = 1000)
+    public void smartPlugConsumptionFakeUpdate() {
+        smartPlugRepository.updateTotalConsumption(SmartPlug.AVERAGE_CONSUMPTION_KW);
+        final Collection<SmartPlug> c = smartPlugRepository.findByOn(true);
+        c.forEach(s -> sensorSocketEndpoint.broadcast(s, sensorRepository.findUser(s.getId())));
+    }
 }

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

@@ -61,6 +61,12 @@ public class SensorSocketEndpoint extends Endpoint {
         final Collection<Session> sessions = authorizedClients.get(u);
         return sessions.stream()
                 .parallel()
+                .filter(
+                        s -> {
+                            if (s.isOpen()) return true;
+                            sessions.remove(s);
+                            return false;
+                        })
                 .filter(didThrow(s -> s.getBasicRemote().sendText(gson.toJson(message))))
                 .count();
     }

src/main/resources/application.properties

@@ -5,7 +5,7 @@ spring.datasource.password=
 
 # Hibernate properties
 spring.jpa.database=POSTGRESQL
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
 spring.jpa.properties.hibernate.format_sql=true