Challenge redislabs-training#3

src/main/java/com/redislabs/university/RU102J/dao/SiteStatsDaoRedisImpl.java

@@ -13,7 +13,7 @@
 
 public class SiteStatsDaoRedisImpl implements SiteStatsDao {
 
-    private final int weekSeconds = 60 * 60 * 24 * 7;
+    private static final int weekSeconds = 60 * 60 * 24 * 7;
     private final JedisPool jedisPool;
     private final CompareAndUpdateScript compareAndUpdateScript;
 
@@ -47,7 +47,7 @@ public void update(MeterReading reading) {
             ZonedDateTime day = reading.getDateTime();
             String key = RedisSchema.getSiteStatsKey(siteId, day);
 
-            updateBasic(jedis, key, reading);
+            updateOptimized(jedis, key, reading);
         }
     }
 
@@ -81,6 +81,16 @@ private void updateBasic(Jedis jedis, String key, MeterReading reading) {
     // Challenge #3
     private void updateOptimized(Jedis jedis, String key, MeterReading reading) {
         // START Challenge #3
+        Transaction transaction = jedis.multi();
+        String reportingTime = ZonedDateTime.now(ZoneOffset.UTC).toString();
+        transaction.hset(key, SiteStats.reportingTimeField, reportingTime);
+        transaction.hincrBy(key, SiteStats.countField, 1);
+        transaction.expire(key, weekSeconds);
+        compareAndUpdateScript.updateIfGreater(transaction, key, SiteStats.maxWhField, reading.getWhGenerated());
+        compareAndUpdateScript.updateIfLess(transaction, key, SiteStats.minWhField, reading.getWhGenerated());
+        compareAndUpdateScript.updateIfGreater(transaction, key, SiteStats.maxCapacityField, getCurrentCapacity(reading));
+
+        transaction.exec();
         // END Challenge #3
     }