Adjust analytics with more stats on active players

database/repositories/baseRepository.js

@@ -29,12 +29,35 @@ export class BaseRepository {
   });
 
   readBy = withErrorHandling(async (criteria) => {
-    const result = await this.db(this.tableName).where(criteria).first();
+    let query = this.db(this.tableName);
+    for (const [column, condition] of Object.entries(criteria)) {
+      if (typeof condition === 'object') {
+        for (const [operator, value] of Object.entries(condition)) {
+          query = query.where(column, operator, value);
+        }
+      } else {
+        query = query.where(column, condition);
+      }
+    }
+    const result = await query.first();
     return result || null;
   });
 
   readAllBy = withErrorHandling(async (criteria, options = {}) => {
-    let query = this.db(this.tableName).where(criteria);
+    let query = this.db(this.tableName);
+
+    // Handle criteria with possible operators
+    for (const [column, condition] of Object.entries(criteria)) {
+      if (typeof condition === 'object') {
+        // Process operator-based conditions
+        for (const [operator, value] of Object.entries(condition)) {
+          query = query.where(column, operator, value);
+        }
+      } else {
+        // Process simple equality conditions
+        query = query.where(column, condition);
+      }
+    }
 
     if (options.excludeNull) {
       query = query.whereNotNull(options.excludeNull);

services/commands/getAnalytics.js

@@ -11,13 +11,19 @@ export async function getAnalytics() {
   const avgPredictions = matchPrediction?.avgPredictions || 0;
   const winratePrediction = matchPrediction?.winratePredictions || 0;
   const webhookListLength = await webhookMgr.getRestrictionsCount();
+
+  const actionThresholds = [0, 10, 100];
+  const [totalActivePlayers, totalActivePlayersGt10, totalActivePlayersGt100] = await Promise.all(
+    actionThresholds.map((threshold) =>
+      database.teams
+        .readAllBy({ actions_used: { '>': threshold } }) // Fetch rows with actions_used > threshold
+        .then((res) => res?.length || 0)
+    )
+  );
+
   const text = [
-    `winrate predictions: ${(
-      (winratePrediction / totalMatches || 0) * 100
-    ).toFixed(2)} %`,
-    `avg predictions: ${((avgPredictions / totalMatches || 0) * 100).toFixed(
-      2
-    )} %`,
+    `winrate predictions: ${((winratePrediction / totalMatches || 0) * 100).toFixed(2)} %`,
+    `avg predictions: ${((avgPredictions / totalMatches || 0) * 100).toFixed(2)} %`,
     '',
     `Total matches: ${totalMatches}`,
     `Pending matches: ${totalTempPredictions}`,
@@ -26,6 +32,9 @@ export async function getAnalytics() {
       (totalActiveTeams / totalTeams || 0) * 100
     ).toFixed(2)} %)`,
     `Total players: ${totalPlayers}`,
+    `Active players (>0 actions): ${totalActivePlayers}`,
+    `Active players (>10 actions): ${totalActivePlayersGt10}`,
+    `Active players (>100 actions): ${totalActivePlayersGt100}`,
     `Webhook static list length: ${webhookListLength}`,
   ].join('\n');