Updated biggest spenders functionality

Author: NLxAROSA

src/main/java/com/redislabs/demos/redisbank/transactions/BankTransactionForwarder.java

@@ -53,7 +53,6 @@ public void afterPropertiesSet() throws Exception {
 
     @Override
     public void onMessage(MapRecord<String, String, String> message) {
-        LOGGER.info("Hello message");
         // Update search index whenever a new transaction arrives via the stream
         String messageString = message.getValue().get("transaction");
         try {
@@ -66,6 +65,7 @@ public void onMessage(MapRecord<String, String, String> message) {
         // Stream message to websocket connection topic
         smso.convertAndSend(config.getStomp().getTransactionsTopic(), message.getValue());
         LOGGER.info("Streamed: {}", messageString);
+
     }
 
     @Override

src/main/java/com/redislabs/demos/redisbank/transactions/BankTransactionGenerator.java

@@ -12,8 +12,8 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.redislabs.demos.redisbank.Utilities;
 import com.redislabs.demos.redisbank.SerializationUtil;
+import com.redislabs.demos.redisbank.Utilities;
 import com.redislabs.lettusearch.Field;
 import com.redislabs.lettusearch.Field.Text.PhoneticMatcher;
 import com.redislabs.lettusearch.RediSearchCommands;
@@ -39,6 +39,7 @@ public class BankTransactionGenerator {
     private static final String ACCOUNT_INDEX = "transaction_account_idx";
     private static final String SEARCH_INDEX = "transaction_description_idx";
     private static final String BALANCE_TS = "balance_ts";
+    private static final String SORTED_SET_KEY = "bigspenders";
     private final List<TransactionSource> transactionSources;
     private final SecureRandom random;
     private final DateFormat df = new SimpleDateFormat("yyyy.MM.dd 'at' HH:mm:ss");
@@ -58,6 +59,7 @@ public BankTransactionGenerator(StringRedisTemplate redis, StatefulRediSearchCon
         random.setSeed("lars".getBytes("UTF-8")); // Prime the RNG so it always generates the same pseudorandom set
 
         createSearchIndices();
+        deleteSortedSet();
         createTimeSeries();
         createInitialStream();
 
@@ -84,6 +86,10 @@ private void createSearchIndices() {
                 Field.text("transactionType").matcher(PhoneticMatcher.English).build());
     }
 
+    private void deleteSortedSet()  {
+        redis.delete(SORTED_SET_KEY);
+    }
+
     private void createTimeSeries() {
         redis.delete(BALANCE_TS);
         rts.create(BALANCE_TS, 0, null);
@@ -111,7 +117,6 @@ private void streamBankTransaction(BankTransaction bankTransaction) {
             transactionString = SerializationUtil.serializeObject(bankTransaction);
             update.put(TRANSACTION_KEY, transactionString);
             redis.opsForStream().add(TRANSACTIONS_STREAM, update);
-            LOGGER.info("Update: {}", transactionString);
         } catch (JsonProcessingException e) {
             LOGGER.error("Error serialising object to JSON", e.getMessage());
         }
@@ -127,13 +132,13 @@ private BankTransaction createBankTransaction() {
         transaction.setFromAccount(Utilities.generateFakeIbanFrom(ts.getFromAccountName()));
         transaction.setDescription(ts.getDescription());
         transaction.setTransactionType(ts.getType());
-        transaction.setAmount(createTransactionAmount());
+        transaction.setAmount(createTransactionAmount(transaction.getFromAccountName()));
         transaction.setTransactionDate(df.format(new Date()));
         transaction.setBalanceAfter(nf.format(balance));
         return transaction;
     }
 
-    private String createTransactionAmount() {
+    private String createTransactionAmount(String accountName) {
         Double bandwidth = (1 + random.nextInt(3)) * 100.00;
         Double amount = random.nextDouble() * bandwidth % 300.0;
         Double roundedAmount = Math.floor(amount * 100) / 100;
@@ -144,6 +149,8 @@ private String createTransactionAmount() {
 
         balance = balance + roundedAmount;
         rts.add(BALANCE_TS, balance);
+        redis.opsForZSet().incrementScore(SORTED_SET_KEY, accountName, roundedAmount * -1);
+
         return nf.format(roundedAmount);
     }
 

src/main/java/com/redislabs/demos/redisbank/transactions/BiggestSpenders.java

@@ -0,0 +1,16 @@
+package com.redislabs.demos.redisbank.transactions;
+
+import lombok.Data;
+
+@Data
+public class BiggestSpenders {
+
+    private final double[] series;
+    private final String[] labels; 
+
+    public BiggestSpenders(int size)  {
+        this.series = new double[size];
+        this.labels = new String[size];
+    }
+
+}

src/main/java/com/redislabs/demos/redisbank/transactions/TransactionOverviewController.java

@@ -1,5 +1,7 @@
 package com.redislabs.demos.redisbank.transactions;
 
+import java.util.Set;
+
 import com.redislabs.demos.redisbank.Config;
 import com.redislabs.demos.redisbank.Config.StompConfig;
 import com.redislabs.demos.redisbank.UserSession;
@@ -14,6 +16,8 @@
 import com.redislabs.redistimeseries.RedisTimeSeries;
 import com.redislabs.redistimeseries.Value;
 
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,18 +32,21 @@ public class TransactionOverviewController {
     private static final String ACCOUNT_INDEX = "transaction_account_idx";
     private static final String SEARCH_INDEX = "transaction_description_idx";
     private static final String BALANCE_TS = "balance_ts";
+    private static final String SORTED_SET_KEY = "bigspenders";
 
     private final Config config;
     private final UserSessionRepository userSessionRepository;
     private final StatefulRediSearchConnection<String, String> srsc;
     private final RedisTimeSeries rts;
+    private final StringRedisTemplate redis;
 
     public TransactionOverviewController(Config config, UserSessionRepository userSessionRepository,
-            StatefulRediSearchConnection<String, String> srsc, RedisTimeSeries rts) {
+            StatefulRediSearchConnection<String, String> srsc, RedisTimeSeries rts, StringRedisTemplate redis) {
         this.config = config;
         this.userSessionRepository = userSessionRepository;
         this.srsc = srsc;
         this.rts = rts;
+        this.redis = redis;
     }
 
     @GetMapping("/config/stomp")
@@ -61,6 +68,26 @@ public Balance[] listTransactionsByDate() {
         return balanceTs;
     }
 
+    @GetMapping("/biggestspenders")
+    public BiggestSpenders biggestSpenders() {
+
+        Set<TypedTuple<String>> range = redis.opsForZSet().rangeByScoreWithScores(SORTED_SET_KEY, 0, Double.MAX_VALUE);
+
+        if (range.size() > 0) {
+            BiggestSpenders biggestSpenders = new BiggestSpenders(range.size());
+            int i = 0;
+            for (TypedTuple<String> typedTuple : range) {
+                biggestSpenders.getSeries()[i] = typedTuple.getScore();
+                biggestSpenders.getLabels()[i] = typedTuple.getValue();
+                i++;
+            }
+            return biggestSpenders;
+        } else {
+            return new BiggestSpenders(0);
+        }
+
+    }
+
     @GetMapping("/search")
     @SuppressWarnings("all")
     public SearchResults<String, String> searchTransactions(@RequestParam("term") String term) {

src/main/resources/static/assets/js/transactions.js

@@ -125,18 +125,24 @@ axios.get("/api/balance")
     console.log('Error! Could not reach the API. ' + error)
   })
 
-var options = {
-  series: [44, 55, 13, 43, 22],
+var pieOptions = {
+  series: [1,2,3,4,5],
   chart: {
     height: 350,
-    type: 'pie',
+    type: 'donut',
+    options: {
+      chart: {
+        id: "chart-id"
+      }
+    }
   },
-  labels: ['Starbucks', 'Shell', 'BMW FS', 'Picnic', 'H&M'],
+  labels: ['a','b','c','d','e'],
   responsive: [{
     breakpoint: 480,
     options: {
       chart: {
-        width: 200
+        width: 200,
+        id: "chart-id"
       },
       legend: {
         position: 'bottom'
@@ -145,5 +151,18 @@ var options = {
   }]
 };
 
-var chart = new ApexCharts(document.querySelector("#chart"), options);
-chart.render();
+axios.get("/api/biggestspenders")
+  .then(function (response) {
+
+    pieOptions.series = response.data.series
+    pieOptions.labels = response.data.labels
+
+    console.log('pieooptons', pieOptions)
+
+    var chart = new ApexCharts(document.querySelector("#chart"), pieOptions);
+    chart.render()
+    
+  })
+  .catch(function (error) {
+    console.log('Error! Could not reach the API. ' + error)
+  })