add friendsRank to daily rank

Author: fehmer

backend/__tests__/__integration__/utils/daily-leaderboards.spec.ts

@@ -344,11 +344,11 @@ describe("Daily Leaderboards", () => {
         //WHEN / THEN
         expect(
           await lb.getRank(user2.uid, dailyLeaderboardsConfig, friends)
-        ).toEqual({ rank: 1, ...user2 });
+        ).toEqual({ rank: 2, friendsRank: 1, ...user2 });
 
         expect(
           await lb.getRank(user1.uid, dailyLeaderboardsConfig, friends)
-        ).toEqual({ rank: 2, ...user1 });
+        ).toEqual({ rank: 3, friendsRank: 2, ...user1 });
       });
     });
 

backend/redis-scripts/get-rank.lua

@@ -15,6 +15,7 @@ local include_scores = ARGV[2]
 local user_ids_csv = ARGV[3]
 
 local rank = nil
+local friendsRank = nil
 local result = {}   
 local score = ''
 
@@ -35,20 +36,16 @@ if user_ids_csv ~= "" then
 
     for i = 1, #scored_users do
         if scored_users[i].user_id == user_id then
-            rank = i - 1
+            friendsRank = i - 1
         end
     end
 
-else
--- global leaderboarc
-    
-    rank = redis_call('ZREVRANK', leaderboard_scores_key, user_id)
-    
 end
 
+rank = redis_call('ZREVRANK', leaderboard_scores_key, user_id)
 if (include_scores == "true") then
     score = redis_call('ZSCORE', leaderboard_scores_key, user_id)
 end
 result = redis_call('HGET', leaderboard_results_key, user_id)
 
-return {rank, score, result}
+return {rank, score, result, friendsRank}

backend/src/init/redis.ts

@@ -43,7 +43,7 @@ export type RedisConnectionWithCustomMethods = Redis & {
     uid: string,
     withScores: string,
     userIds: string
-  ) => Promise<[number, string, string]>; //rank, score(optional), entry json
+  ) => Promise<[number, string, string, number]>; //rank, score(optional), entry json, friendsRank(optional)
   purgeResults: (
     keyCount: number,
     uid: string,

backend/src/utils/daily-leaderboards.ts

@@ -209,7 +209,7 @@ export class DailyLeaderboard {
     const { leaderboardScoresKey, leaderboardResultsKey } =
       this.getTodaysLeaderboardKeys();
 
-    const [rank, _score, result] = await connection.getRank(
+    const [rank, _score, result, friendsRank] = await connection.getRank(
       2,
       leaderboardScoresKey,
       leaderboardResultsKey,
@@ -229,6 +229,7 @@ export class DailyLeaderboard {
           RedisDailyLeaderboardEntrySchema
         ),
         rank: rank + 1,
+        friendsRank: friendsRank !== undefined ? friendsRank + 1 : undefined,
       };
     } catch (error) {
       throw new Error(