Added leaderboard to import completed events

Fixes #299
Fortify-Labs · Feb 1, 2021 · d4dfe97 · d4dfe97
1 parent 1b976f1
commit d4dfe97
Show file tree

Hide file tree

Showing 9 changed files with 9,025 additions and 1,352 deletions.
diff --git a/services/historization/package-lock.json b/services/historization/package-lock.json
diff --git a/services/historization/package.json b/services/historization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "historization",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "A historization service responsible for persisting info",
   "author": {
     "name": "Thomas Kosiewski"

diff --git a/services/historization/src/services/leaderboardPersistor.ts b/services/historization/src/services/leaderboardPersistor.ts
@@ -36,20 +36,35 @@ export class LeaderboardPersistor {
 	async storeLeaderboard(event: ImportCompletedEvent) {
 		// Fetch corresponding leaderboard from redis
 		const leaderboardType = event.leaderboardType;
-		const rawLeaderboard = await this.redis.getAsync(
-			`ul:leaderboard:${leaderboardType}`,
-		);
 
-		if (!rawLeaderboard) {
-			this.logger.error("No leaderboard found in redis", {
+		const leaderboard: ULLeaderboard | undefined =
+			event.args?.leaderboard ||
+			(await (async () => {
+				const rawLeaderboard = await this.redis.getAsync(
+					`ul:leaderboard:${leaderboardType}`,
+				);
+
+				if (!rawLeaderboard) {
+					this.logger.error("No leaderboard found in redis", {
+						leaderboardType,
+						event,
+					});
+					return;
+				}
+
+				const leaderboard: ULLeaderboard = JSON.parse(rawLeaderboard);
+
+				return leaderboard;
+			})());
+
+		if (!leaderboard) {
+			this.logger.error("Leaderboard is not set", {
 				leaderboardType,
 				event,
 			});
 			return;
 		}
 
-		const leaderboard: ULLeaderboard = JSON.parse(rawLeaderboard);
-
 		// Fetch current users from postgres
 		const userRepo = await this.postgres.getUserRepo();
 		const steamids = (