Group jobs by hodler before splitting them into batches

Author: kanshi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "staking-rewards-controller",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "",
   "contributors": [
     "ANYONE Protocol Labs",

src/distribution/distribution.service.ts

@@ -54,26 +54,37 @@ export class DistributionService {
   }
 
   public groupScoreJobs(data: ScoreData[]): ScoreData[][] {
-    const result = data.reduce<ScoreData[][]>((curr, score): ScoreData[][] => {
-      if (curr.length == 0) {
-        curr.push([score])
-      } else {
-        if (curr[curr.length - 1].length < DistributionService.scoresPerBatch) {
-          const last = curr.pop()
-          if (last != undefined) {
-            last.push(score)
-            curr.push(last)
-          } else {
-            this.logger.error('Last element not found, this should not happen')
-          }
-        } else {
-          curr.push([score])
-        }
+    const scoresByHodler = new Map<string, ScoreData[]>()
+    for (const score of data) {
+      const hodlerScores = scoresByHodler.get(score.Hodler) || []
+      hodlerScores.push(score)
+      scoresByHodler.set(score.Hodler, hodlerScores)
+    }
+
+    const hodlerGroups = Array.from(scoresByHodler.values())
+
+    const result: ScoreData[][] = []
+    let currentBatch: ScoreData[] = []
+
+    for (const hodlerScores of hodlerGroups) {
+      if (
+        currentBatch.length > 0 &&
+        currentBatch.length + hodlerScores.length > DistributionService.scoresPerBatch
+      ) {
+        result.push(currentBatch)
+        currentBatch = []
       }
-      return curr
-    }, [])
 
-    this.logger.debug(`Created ${result.length} groups out of ${data.length}`)
+      currentBatch.push(...hodlerScores)
+    }
+
+    if (currentBatch.length > 0) {
+      result.push(currentBatch)
+    }
+
+    this.logger.debug(
+      `Created ${result.length} groups out of ${data.length} scores from ${hodlerGroups.length} hodlers`
+    )
 
     return result
   }