Merge pull request #58 from moreal/avatar-dailyreward

feat(api): include `dailyRewardReceivedIndex` in the `Models.Agent.Avatar` model
planetarium · May 16, 2024 · a44bf0c · a44bf0c
2 parents 859182e + 49e901b
commit a44bf0c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/Mimir.Worker/Scrapper/StateGetter.cs b/Mimir.Worker/Scrapper/StateGetter.cs
@@ -102,6 +102,11 @@ public async Task<AvatarState> GetAvatarState(Address avatarAddress)
         {
             avatarState.actionPoint = actionPoint;
         }
+
+        if (await GetStateWithLegacyAccount(avatarAddress, Addresses.DailyReward) is Integer dailyRewardReceivedIndex)
+        {
+            avatarState.dailyRewardReceivedIndex = dailyRewardReceivedIndex;
+        }
 
         return avatarState;
     }

diff --git a/Mimir/Controllers/AgentController.cs b/Mimir/Controllers/AgentController.cs
@@ -26,7 +26,7 @@ IStateService stateService
         }
 
         return new AvatarsResponse(
-            avatars.Select(e => new Avatar(e.address.ToString(), e.name, e.level, e.actionPoint)).ToList()
+            avatars.Select(e => new Avatar(e.address.ToString(), e.name, e.level, e.actionPoint, e.dailyRewardReceivedIndex)).ToList()
         );
     }
 }
diff --git a/Mimir/Models/Agent/Avatar.cs b/Mimir/Models/Agent/Avatar.cs
@@ -1,9 +1,10 @@
 namespace Mimir.Models.Agent;
 
-public class Avatar(string avatarAddress, string avatarName, int level, int actionPoint)
+public class Avatar(string avatarAddress, string avatarName, int level, int actionPoint, long dailyRewardReceivedIndex)
 {
     public string AvatarAddress { get; set; } = avatarAddress;
     public string AvatarName { get; set; } = avatarName;
     public int Level { get; set; } = level;
     public int ActionPoint { get; private set; } = actionPoint;
+    public long DailyRewardReceivedIndex { get; private set; } = dailyRewardReceivedIndex;
 }
diff --git a/Mimir/Repositories/ArenaRankingRespository.cs b/Mimir/Repositories/ArenaRankingRespository.cs
@@ -161,7 +161,8 @@ private async Task<ArenaRanking> BuildArenaRankingFromDocument(BsonDocument docu
             document["Avatar"]["Avatar"]["address"].AsString,
             document["Avatar"]["Avatar"]["name"].AsString,
             document["Avatar"]["Avatar"]["level"].AsInt32,
-            document["Avatar"]["Avatar"]["actionPoint"].AsInt32
+            document["Avatar"]["Avatar"]["actionPoint"].AsInt32,
+            document["Avatar"]["Avatar"]["dailyRewardReceivedIndex"].AsInt64
         );
         arenaRanking.Avatar = avatar;
 

diff --git a/Mimir/Util/StateGetter.cs b/Mimir/Util/StateGetter.cs
@@ -101,6 +101,11 @@ await stateService.GetState(address, accountAddress) ??
         {
             avatarState.actionPoint = actionPoint;
         }
+
+        if (await GetStateAsync(avatarAddress, Addresses.DailyReward) is Integer dailyRewardReceivedIndex)
+        {
+            avatarState.dailyRewardReceivedIndex = dailyRewardReceivedIndex;
+        }
 
         return avatarState;
     }