Merge pull request #68 from planetarium/refactor-minor

feat: introduce "{network}/avatars/{address}"
planetarium · May 17, 2024 · 7369ad3 · 7369ad3
2 parents 087a211 + 7e772b5
commit 7369ad3
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 9 deletions.
diff --git a/Mimir/Controllers/AgentController.cs b/Mimir/Controllers/AgentController.cs
@@ -8,7 +8,7 @@ namespace Mimir.Controllers;
 
 [ApiController]
 [Route("{network}/agent")]
-public class AccountController : ControllerBase
+public class AgentController : ControllerBase
 {
     [HttpGet("{agentAddress}/avatars")]
     public async Task<AvatarsResponse> GetAvatars(
@@ -26,7 +26,7 @@ IStateService stateService
         }
 
         return new AvatarsResponse(
-            avatars.Select(e => new Avatar(e.address.ToString(), e.name, e.level, e.actionPoint, e.dailyRewardReceivedIndex)).ToList()
+            avatars.Select(e => new Avatar(e)).ToList()
         );
     }
 }
diff --git a/Mimir/Controllers/AvatarController.cs b/Mimir/Controllers/AvatarController.cs
@@ -3,6 +3,7 @@
 using Libplanet.Common;
 using Libplanet.Crypto;
 using Microsoft.AspNetCore.Mvc;
+using Mimir.Models.Agent;
 using Mimir.Models.Avatar;
 using Mimir.Repositories;
 using Mimir.Services;
@@ -14,7 +15,7 @@
 namespace Mimir.Controllers;
 
 [ApiController]
-[Route("{network}/avatars")]
+[Route("{network}/avatars/{address}")]
 public class AvatarController(AvatarRepository avatarRepository) : ControllerBase
 {
     #region temporary snippets
@@ -98,13 +99,47 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
 
     #endregion snippets
 
-    [HttpGet("{avatarAddress}/inventory")]
+    [HttpGet]
+    public async Task<Avatar?> GetState(
+        string network,
+        string address,
+        IStateService stateService)
+    {
+        var avatar = avatarRepository.GetAvatar(network, address);
+        if (avatar is not null)
+        {
+            return avatar;
+        }
+
+        Address addr;
+        try
+        {
+            addr = new Address(address);
+        }
+        catch (ArgumentException)
+        {
+            Response.StatusCode = StatusCodes.Status400BadRequest;
+            return null;
+        }
+
+        var stateGetter = new StateGetter(stateService);
+        var avatarState = await stateGetter.GetAvatarStateAsync(addr);
+        if (avatarState is null)
+        {
+            Response.StatusCode = StatusCodes.Status404NotFound;
+            return null;
+        }
+
+        return new Avatar(avatarState);
+    }
+
+    [HttpGet("inventory")]
     public async Task<Inventory?> GetInventory(
         string network,
-        string avatarAddress,
+        string address,
         IStateService stateService)
     {
-        var inventory = avatarRepository.GetInventory(network, avatarAddress);
+        var inventory = avatarRepository.GetInventory(network, address);
         if (inventory is not null)
         {
             return inventory;
@@ -113,9 +148,9 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
         Address inventoryAddress;
         try
         {
-            inventoryAddress = new Address(avatarAddress);
+            inventoryAddress = new Address(address);
         }
-        catch (ArgumentException e)
+        catch (ArgumentException)
         {
             Response.StatusCode = StatusCodes.Status400BadRequest;
             return null;

diff --git a/Mimir/Models/Agent/Avatar.cs b/Mimir/Models/Agent/Avatar.cs
@@ -1,10 +1,29 @@
+using Nekoyume.Model.State;
+
 namespace Mimir.Models.Agent;
 
-public class Avatar(string avatarAddress, string avatarName, int level, int actionPoint, long dailyRewardReceivedIndex)
+public class Avatar(
+    string agentAddress,
+    string avatarAddress,
+    string avatarName,
+    int level,
+    int actionPoint,
+    long dailyRewardReceivedIndex)
 {
+    public string AgentAddress { get; set; } = agentAddress;
     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;
+
+    public Avatar(AvatarState avatarState) : this(
+        avatarState.agentAddress.ToString(),
+        avatarState.address.ToString(),
+        avatarState.name,
+        avatarState.level,
+        avatarState.actionPoint,
+        avatarState.dailyRewardReceivedIndex)
+    {
+    }
 }
diff --git a/Mimir/Repositories/ArenaRankingRespository.cs b/Mimir/Repositories/ArenaRankingRespository.cs
@@ -158,6 +158,7 @@ private async Task<ArenaRanking> BuildArenaRankingFromDocument(BsonDocument docu
         }
 
         var avatar = new Avatar(
+            document["Avatar"]["Avatar"]["agentAddress"].AsString,
             document["Avatar"]["Avatar"]["address"].AsString,
             document["Avatar"]["Avatar"]["name"].AsString,
             document["Avatar"]["Avatar"]["level"].AsInt32,

diff --git a/Mimir/Repositories/AvatarRepository.cs b/Mimir/Repositories/AvatarRepository.cs
@@ -1,3 +1,4 @@
+using Mimir.Models.Agent;
 using Mimir.Models.Avatar;
 using Mimir.Services;
 using MongoDB.Bson;
@@ -16,6 +17,33 @@ protected override string GetCollectionName()
     {
         return "avatars";
     }
+
+    public Avatar? GetAvatar(string network, string avatarAddress)
+    {
+        var collection = GetCollection(network);
+        var filter = Builders<BsonDocument>.Filter.Eq("Avatar.address", avatarAddress);
+        var document = collection.Find(filter).FirstOrDefault();
+        if (document is null)
+        {
+            return null;
+        }
+
+        try
+        {
+            return new Avatar(
+                document["Avatar"]["agentAddress"].AsString,
+                document["Avatar"]["address"].AsString,
+                document["Avatar"]["name"].AsString,
+                document["Avatar"]["level"].AsInt32,
+                document["Avatar"]["actionPoint"].AsInt32,
+                document["Avatar"]["dailyRewardReceivedIndex"].AsInt64
+            );
+        }
+        catch (KeyNotFoundException)
+        {
+            return null;
+        }
+    }
 
     public Inventory? GetInventory(string network, string avatarAddress)
     {