Merge branch 'main' into test/test

planetarium · Dec 4, 2024 · b8f0d41 · b8f0d41
2 parents 734b456 + b12d64f
commit b8f0d41
Show file tree

Hide file tree

Showing 27 changed files with 645 additions and 23 deletions.
diff --git a/Lib9c.Models/Items/Inventory.cs b/Lib9c.Models/Items/Inventory.cs
@@ -14,7 +14,9 @@ namespace Lib9c.Models.Items;
 public record Inventory : IBencodable
 {
     public List<InventoryItem> Items { get; init; }
-
+
+    public Inventory() { }
+
     [BsonIgnore, GraphQLIgnore, JsonIgnore]
     public IValue Bencoded => new List(Items
         .OrderBy(i => i.Item.Id)

diff --git a/Lib9c.Models/Items/InventoryItem.cs b/Lib9c.Models/Items/InventoryItem.cs
@@ -19,7 +19,9 @@ public record InventoryItem : IBencodable
     public ItemBase Item { get; init; }
     public int Count { get; init; }
     public ILock? Lock { get; init; }
-
+
+    public InventoryItem() { }
+
     [BsonIgnore, GraphQLIgnore, JsonIgnore]
     public IValue Bencoded
     {

diff --git a/Lib9c.Models/Stake/Contract.cs b/Lib9c.Models/Stake/Contract.cs
@@ -25,6 +25,8 @@ public record Contract : IBencodable
     public long RewardInterval { get; init; }
     public long LockupInterval { get; init; }
 
+    public Contract(){}
+
     public Contract(IValue bencoded)
     {
         if (bencoded is not List l)

diff --git a/Lib9c.Models/States/StakeState.cs b/Lib9c.Models/States/StakeState.cs
@@ -19,6 +19,8 @@ public record StakeState : IBencodable
     public Contract Contract { get; init; }
     public long StartedBlockIndex { get; init; }
     public long ReceivedBlockIndex { get; init; }
+
+    public StakeState() {}
 
     [BsonIgnore, GraphQLIgnore, JsonIgnore]
     public IValue Bencoded =>

diff --git a/Mimir.MongoDB/Bson/PledgeDocument.cs b/Mimir.MongoDB/Bson/PledgeDocument.cs
@@ -11,4 +11,5 @@ public record PledgeDocument(
     Address ContractAddress,
     bool Contracted,
     int RefillMead
-) : MimirBsonDocument(Address.ToHex(), new DocumentMetadata(1, StoredBlockIndex)) { }
+) : MimirBsonDocument(Address.ToHex(), new DocumentMetadata(1, StoredBlockIndex));
+
diff --git a/Mimir.MongoDB/Repositories/ActionPointRepository.cs b/Mimir.MongoDB/Repositories/ActionPointRepository.cs
@@ -10,7 +10,6 @@ public interface IActionPointRepository
 {
     Task<ActionPointDocument> GetByAddressAsync(Address address);
 }
-
 public class ActionPointRepository(IMongoDbService dbService) : IActionPointRepository
 {
     public virtual async Task<ActionPointDocument> GetByAddressAsync(Address address)

diff --git a/Mimir.MongoDB/Repositories/InventoryRepository.cs b/Mimir.MongoDB/Repositories/InventoryRepository.cs
@@ -6,7 +6,12 @@
 
 namespace Mimir.MongoDB.Repositories;
 
-public class InventoryRepository(IMongoDbService dbService)
+public interface IInventoryRepository
+{
+    public Task<InventoryDocument> GetByAddressAsync(Address address);
+}
+
+public class InventoryRepository(IMongoDbService dbService) : IInventoryRepository
 {
     public async Task<InventoryDocument> GetByAddressAsync(Address address)
     {

diff --git a/Mimir.MongoDB/Repositories/MetadataRepository.cs b/Mimir.MongoDB/Repositories/MetadataRepository.cs
@@ -4,8 +4,13 @@
 using MongoDB.Driver;
 
 namespace Mimir.MongoDB.Repositories;
-
-public class MetadataRepository(IMongoDbService dbService)
+public interface IMetadataRepository{
+    Task<MetadataDocument> GetByCollectionAsync(string collectionName);
+    Task<MetadataDocument> GetByCollectionAndTypeAsync(
+        string pollerType,
+        string collectionName);
+}
+public class MetadataRepository(IMongoDbService dbService):IMetadataRepository
 {
     public async Task<MetadataDocument> GetByCollectionAsync(string collectionName)
     {

diff --git a/Mimir.MongoDB/Repositories/PledgeRepository.cs b/Mimir.MongoDB/Repositories/PledgeRepository.cs
@@ -5,8 +5,13 @@
 using MongoDB.Driver;
 
 namespace Mimir.MongoDB.Repositories;
+public interface IPledgeRepository
+{
+    Task<PledgeDocument> GetByAddressAsync(Address address);
+}
+
 
-public class PledgeRepository(IMongoDbService dbService)
+public class PledgeRepository(IMongoDbService dbService) : IPledgeRepository
 {
     public async Task<PledgeDocument> GetByAddressAsync(Address address)
     {

diff --git a/Mimir.MongoDB/Repositories/ProductRepository.cs b/Mimir.MongoDB/Repositories/ProductRepository.cs
@@ -15,7 +15,12 @@
 
 namespace Mimir.MongoDB.Repositories;
 
-public class ProductRepository
+public interface IProductRepository
+{
+    Task<ProductDocument> GetByProductIdAsync(Guid productId);
+} 
+
+public class ProductRepository : IProductRepository
 {
     private static readonly Codec Codec = new();
 

diff --git a/Mimir.MongoDB/Repositories/ProductsRepository.cs b/Mimir.MongoDB/Repositories/ProductsRepository.cs
@@ -6,7 +6,11 @@
 
 namespace Mimir.MongoDB.Repositories;
 
-public class ProductsRepository(IMongoDbService dbService)
+public interface IProductsRepository{
+    Task<ProductsStateDocument> GetByAvatarAddressAsync(Address avatarAddress);
+}
+
+public class ProductsRepository(IMongoDbService dbService):IProductsRepository
 {
     public async Task<ProductsStateDocument> GetByAvatarAddressAsync(Address avatarAddress)
     {

diff --git a/Mimir.MongoDB/Repositories/StakeRepository.cs b/Mimir.MongoDB/Repositories/StakeRepository.cs
@@ -6,7 +6,12 @@
 
 namespace Mimir.MongoDB.Repositories;
 
-public class StakeRepository(IMongoDbService dbService)
+public interface IStakeRepository
+{
+    Task<StakeDocument> GetByAgentAddressAsync(Address agentAddress);
+}
+
+public class StakeRepository(IMongoDbService dbService) : IStakeRepository
 {
     public async Task<StakeDocument> GetByAgentAddressAsync(Address agentAddress)
     {

diff --git a/Mimir.Tests/Mimir.Tests.csproj b/Mimir.Tests/Mimir.Tests.csproj
@@ -26,5 +26,11 @@
   <ItemGroup>
       <ProjectReference Include="..\Mimir\Mimir.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="QueryTests\InventoryTest.GraphQL_Query_Inventory_Returns_CorrectValue.received.txt">
+      <DependentUpon>InventoryTest.cs</DependentUpon>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/....Tests/QueryTests/InventoryTest.GraphQL_Query_Inventory_Returns_CorrectValue.verified.txt b/....Tests/QueryTests/InventoryTest.GraphQL_Query_Inventory_Returns_CorrectValue.verified.txt
@@ -0,0 +1,28 @@
+{
+  "data": {
+    "inventory": {
+      "items": [
+        {
+          "count": 1,
+          "item": {
+            "elementalType": "NORMAL",
+            "grade": 1,
+            "id": 1,
+            "itemSubType": "ARMOR",
+            "itemType": "EQUIPMENT"
+          }
+        },
+        {
+          "count": 2,
+          "item": {
+            "elementalType": "FIRE",
+            "grade": 2,
+            "id": 2,
+            "itemSubType": "FOOD",
+            "itemType": "MATERIAL"
+          }
+        }
+      ]
+    }
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ public interface IActionPointRepository @@
     {
         Task<ActionPointDocument> GetByAddressAsync(Address address);
     }
     public class ActionPointRepository(IMongoDbService dbService) : IActionPointRepository
     {
         public virtual async Task<ActionPointDocument> GetByAddressAsync(Address address)
@@ Expand Down @@