Merge pull request #339 from moreal/arena-simple-avatar

Store `SimpleAvatar` in `ArenaDocument`
planetarium · Sep 25, 2024 · 65a6e71 · 65a6e71
2 parents 37498f5 + 6ee9e2f
commit 65a6e71
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 69 deletions.
diff --git a/Mimir.MongoDB/Bson/ArenaDocument.cs b/Mimir.MongoDB/Bson/ArenaDocument.cs
@@ -1,4 +1,5 @@
 using Lib9c.Models.Arena;
+using Lib9c.Models.States;
 using Libplanet.Crypto;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
@@ -13,7 +14,8 @@ public record ArenaDocument(
  int ChampionshipId,
  int Round,
  ArenaInformation ArenaInformation,
- ArenaScore ArenaScore)
+ ArenaScore ArenaScore,
+ SimplifiedAvatarState SimpleAvatar)
  : MimirBsonDocument(Address)
 {
  [BsonIgnore, JsonIgnore]

diff --git a/Mimir.MongoDB/Bson/Simplified/SimplifiedAvatarState.cs b/Mimir.MongoDB/Bson/Simplified/SimplifiedAvatarState.cs
@@ -114,4 +114,80 @@ public SimplifiedAvatarState(IValue bencoded)
  bencoded.Kind
  );
  }
+
+ public SimplifiedAvatarState(
+ Address address,
+ int version,
+ string name,
+ int characterId,
+ int level,
+ long exp,
+ long updatedAt,
+ Address agentAddress,
+ MailBox mailBox,
+ long blockIndex,
+ long dailyRewardReceivedIndex,
+ int actionPoint,
+ CollectionMap stageMap,
+ CollectionMap monsterMap,
+ CollectionMap itemMap,
+ CollectionMap eventMap,
+ int hair,
+ int lens,
+ int ear,
+ int tail,
+ List<Address> combinationSlotAddresses,
+ Address rankingMapAddress)
+ : base(new List(address.Bencoded))
+ {
+ Version = version;
+ Name = name;
+ CharacterId = characterId;
+ Level = level;
+ Exp = exp;
+ UpdatedAt = updatedAt;
+ AgentAddress = agentAddress;
+ MailBox = mailBox;
+ BlockIndex = blockIndex;
+ DailyRewardReceivedIndex = dailyRewardReceivedIndex;
+ ActionPoint = actionPoint;
+ StageMap = stageMap;
+ MonsterMap = monsterMap;
+ ItemMap = itemMap;
+ EventMap = eventMap;
+ Hair = hair;
+ Lens = lens;
+ Ear = ear;
+ Tail = tail;
+ CombinationSlotAddresses = combinationSlotAddresses;
+ RankingMapAddress = rankingMapAddress; 
+ }
+
+ public static SimplifiedAvatarState FromAvatarState(AvatarState avatarState)
+ {
+ return new SimplifiedAvatarState(
+ avatarState.Address,
+ avatarState.Version,
+ avatarState.Name,
+ avatarState.CharacterId,
+ avatarState.Level,
+ avatarState.Exp,
+ avatarState.UpdatedAt,
+ avatarState.AgentAddress,
+ avatarState.MailBox,
+ avatarState.BlockIndex,
+ avatarState.DailyRewardReceivedIndex,
+ avatarState.ActionPoint,
+ avatarState.StageMap,
+ avatarState.MonsterMap,
+ avatarState.ItemMap,
+ avatarState.EventMap,
+ avatarState.Hair,
+ avatarState.Lens,
+ avatarState.Ear,
+ avatarState.Tail,
+ avatarState.CombinationSlotAddresses,
+ avatarState.RankingMapAddress
+ );
+ }
 }
diff --git a/Mimir.Worker/ActionHandler/BattleArenaHandler.cs b/Mimir.Worker/ActionHandler/BattleArenaHandler.cs
@@ -1,4 +1,5 @@
 using Lib9c.Abstractions;
+using Lib9c.Models.States;
 using Libplanet.Action;
 using Libplanet.Crypto;
 using Mimir.Worker.CollectionUpdaters;
@@ -49,7 +50,6 @@ await ItemSlotCollectionUpdater.UpdateAsync(
  );
 
  await ProcessArena(blockIndex, battleArena, session, stoppingToken);
- await ProcessAvatar(battleArena, session, stoppingToken);
 
  return true;
  }
@@ -73,8 +73,14 @@ private async Task ProcessArena(
  battleArena.Round,
  stoppingToken
  );
+ var myAvatarState = await StateGetter.GetAvatarState(
+ battleArena.MyAvatarAddress,
+ stoppingToken
+ );
+ var mySimpleAvatarState = SimplifiedAvatarState.FromAvatarState(myAvatarState);
  await ArenaCollectionUpdater.UpsertAsync(
  Store,
+ mySimpleAvatarState,
  myArenaScore,
  myArenaInfo,
  battleArena.MyAvatarAddress,
@@ -96,8 +102,14 @@ await ArenaCollectionUpdater.UpsertAsync(
  battleArena.Round,
  stoppingToken
  );
+ var enemyAvatarState = await StateGetter.GetAvatarState(
+ battleArena.EnemyAvatarAddress,
+ stoppingToken
+ );
+ var enemySimpleAvatarState = SimplifiedAvatarState.FromAvatarState(enemyAvatarState);
  await ArenaCollectionUpdater.UpsertAsync(
  Store,
+ enemySimpleAvatarState,
  enemyArenaScore,
  enemyArenaInfo,
  battleArena.EnemyAvatarAddress,
@@ -107,22 +119,4 @@ await ArenaCollectionUpdater.UpsertAsync(
  stoppingToken
  );
  }
-
- private async Task ProcessAvatar(
- IBattleArenaV1 battleArena,
- IClientSessionHandle? session = null,
- CancellationToken stoppingToken = default
- )
- {
- var myAvatarState = await StateGetter.GetAvatarState(
- battleArena.MyAvatarAddress,
- stoppingToken
- );
- var enemyAvatarState = await StateGetter.GetAvatarState(
- battleArena.EnemyAvatarAddress,
- stoppingToken
- );
- await AvatarCollectionUpdater.UpsertAsync(Store, myAvatarState, session, stoppingToken);
- await AvatarCollectionUpdater.UpsertAsync(Store, enemyAvatarState, session, stoppingToken);
- }
 }
diff --git a/Mimir.Worker/ActionHandler/JoinArenaHandler.cs b/Mimir.Worker/ActionHandler/JoinArenaHandler.cs
@@ -1,4 +1,5 @@
 using Lib9c.Abstractions;
+using Lib9c.Models.States;
 using Libplanet.Action;
 using Libplanet.Crypto;
 using Mimir.Worker.CollectionUpdaters;
@@ -45,7 +46,6 @@ await ItemSlotCollectionUpdater.UpdateAsync(
  );
 
  await ProcessArena(joinArena, session, stoppingToken);
- await ProcessAvatar(joinArena, session, stoppingToken);
 
  return true;
  }
@@ -68,8 +68,14 @@ private async Task ProcessArena(
  joinArena.Round,
  stoppingToken
  );
+ var avatarState = await StateGetter.GetAvatarState(
+ joinArena.AvatarAddress,
+ stoppingToken
+ );
+ var simpleAvatarState = SimplifiedAvatarState.FromAvatarState(avatarState);
  await ArenaCollectionUpdater.UpsertAsync(
  Store,
+ simpleAvatarState,
  arenaScore,
  arenaInfo,
  joinArena.AvatarAddress,
@@ -79,15 +85,4 @@ await ArenaCollectionUpdater.UpsertAsync(
  stoppingToken
  );
  }
-
- private async Task ProcessAvatar(
- IJoinArenaV1 joinArena,
- IClientSessionHandle? session = null,
- CancellationToken stoppingToken = default
- )
- {
- var avatarState = await StateGetter.GetAvatarState(joinArena.AvatarAddress, stoppingToken);
-
- await AvatarCollectionUpdater.UpsertAsync(Store, avatarState, session, stoppingToken);
- }
 }
diff --git a/Mimir.Worker/CollectionUpdaters/ArenaCollectionUpdater.cs b/Mimir.Worker/CollectionUpdaters/ArenaCollectionUpdater.cs
@@ -1,4 +1,5 @@
 using Lib9c.Models.Arena;
+using Lib9c.Models.States;
 using Libplanet.Crypto;
 using Mimir.MongoDB;
 using Mimir.MongoDB.Bson;
@@ -11,6 +12,7 @@ public static class ArenaCollectionUpdater
 {
  public static async Task UpsertAsync(
  MongoDbService dbService,
+ SimplifiedAvatarState simpleAvatar,
  ArenaScore arenaScore,
  ArenaInformation arenaInfo,
  Address avatarAddress,
@@ -22,7 +24,7 @@ public static async Task UpsertAsync(
  {
  await dbService.UpsertStateDataManyAsync(
  CollectionNames.GetCollectionName<ArenaDocument>(),
- [new ArenaDocument(avatarAddress, championshipId, round, arenaInfo, arenaScore),],
+ [new ArenaDocument(avatarAddress, championshipId, round, arenaInfo, arenaScore, simpleAvatar),],
  session,
  stoppingToken
  );

diff --git a/Mimir.Worker/Initializer/ArenaInitializer.cs b/Mimir.Worker/Initializer/ArenaInitializer.cs
@@ -1,4 +1,5 @@
 using Mimir.MongoDB.Bson;
+using Lib9c.Models.States;
 using Mimir.Worker.CollectionUpdaters;
 using Mimir.Worker.Services;
 using MongoDB.Bson;
@@ -45,10 +46,12 @@ public override async Task RunAsync(CancellationToken stoppingToken)
  );
 
  var avatarState = await stateGetter.GetAvatarState(avatarAddress, stoppingToken);
+ var simpleAvatarState = SimplifiedAvatarState.FromAvatarState(avatarState);
 
  _logger.Information("Init arena, address: {AvatarAddress}", avatarAddress);
  await ArenaCollectionUpdater.UpsertAsync(
  _store,
+ simpleAvatarState,
  arenaScore,
  arenaInfo,
  avatarAddress,

diff --git a/Mimir/Repositories/ArenaRepository.cs b/Mimir/Repositories/ArenaRepository.cs
@@ -54,42 +54,6 @@ private async Task<List<ArenaRankingDocument>> GetOrCreateLeaderboardAsync(
  }
  )
  ),
- new(
- "$lookup",
- new BsonDocument
- {
- { "from", "avatar" },
- { "localField", "Address" },
- { "foreignField", "Address" },
- { "as", "SimpleAvatar" }
- }
- ),
- new(
- "$unwind",
- new BsonDocument
- {
- { "path", "$SimpleAvatar" },
- { "preserveNullAndEmptyArrays", true }
- }
- ),
- new(
- "$project",
- new BsonDocument
- {
- { "SimpleAvatar.Object.EventMap", 0 },
- { "SimpleAvatar.Object.ItemMap", 0 },
- { "SimpleAvatar.Object.MailBox", 0 },
- { "SimpleAvatar.Object.MonsterMap", 0 },
- { "SimpleAvatar.Object.StageMap", 0 },
- }
- ),
- new(
- "$addFields",
- new BsonDocument
- {
- { "SimpleAvatar", "$SimpleAvatar.Object" },
- }
- ),
  new("$sort", new BsonDocument("ArenaScore.Score", -1)),
  };