Add output cache for /accounts, /operations, and /tokens/balances end…

…points
baking-bad · Jun 30, 2022 · a57b068 · a57b068
1 parent c2f9c9b
commit a57b068
Show file tree

Hide file tree

Showing 24 changed files with 1,364 additions and 345 deletions.
diff --git a/Tzkt.Api/Controllers/AccountsController.cs b/Tzkt.Api/Controllers/AccountsController.cs
diff --git a/Tzkt.Api/Controllers/OperationsController.cs b/Tzkt.Api/Controllers/OperationsController.cs
diff --git a/Tzkt.Api/Controllers/TokensController.cs b/Tzkt.Api/Controllers/TokensController.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Tzkt.Api.Models;
 using Tzkt.Api.Repositories;
+using Tzkt.Api.Services;
 using Tzkt.Api.Services.Cache;
 
 namespace Tzkt.Api.Controllers
@@ -14,11 +15,13 @@ public class TokensController : ControllerBase
     {
         readonly TokensRepository Tokens;
         readonly StateCache State;
+        readonly ResponseCacheService ResponseCache;
 
-        public TokensController(TokensRepository tokens, StateCache state)
+        public TokensController(TokensRepository tokens, StateCache state, ResponseCacheService responseCache)
         {
             Tokens = tokens;
             State = state;
+            ResponseCache = responseCache;
         }
 
         #region tokens
@@ -84,7 +87,7 @@ public async Task<ActionResult<IEnumerable<Token>>> GetTokens(
         /// <param name="filter">Filter</param>
         /// <returns></returns>
         [HttpGet("balances/count")]
-        public Task<int> GetTokenBalancesCount([FromQuery] TokenBalanceFilter filter)
+        public async Task<ActionResult<int>> GetTokenBalancesCount([FromQuery] TokenBalanceFilter filter)
         {
             if (filter.account != null ||
                 filter.balance != null ||
@@ -98,9 +101,18 @@ public Task<int> GetTokenBalancesCount([FromQuery] TokenBalanceFilter filter)
                 filter.token.tokenId != null ||
                 filter.token.standard != null ||
                 filter.token.metadata != null)
-                return Tokens.GetTokenBalancesCount(filter);
+            {
+                var query = ResponseCacheService.BuildKey(Request.Path.Value, ("filter", filter));
+
+                if (ResponseCache.TryGet(query, out var cached))
+                    return this.Bytes(cached);
+
+                var res = await Tokens.GetTokenBalancesCount(filter);
+                cached = ResponseCache.Set(query, res);
+                return this.Bytes(cached);
+            }
 
-            return Task.FromResult(State.Current.TokenBalancesCount);
+            return Ok(State.Current.TokenBalancesCount);
         }
 
         /// <summary>
@@ -119,14 +131,27 @@ public async Task<ActionResult<IEnumerable<TokenBalance>>> GetTokenBalances(
             [FromQuery] Pagination pagination,
             [FromQuery] Selection selection)
         {
-            if (selection.select == null)
-                return Ok(await Tokens.GetTokenBalances(filter, pagination));
+            var query = ResponseCacheService.BuildKey(Request.Path.Value, 
+                ("filter", filter), ("pagination", pagination), ("selection", selection));
 
-            return Ok(new SelectionResponse
+            if (ResponseCache.TryGet(query, out var cached))
+                return this.Bytes(cached);
+
+            object res;
+            if (selection.select == null)
             {
-                Cols = selection.select.Fields?.Select(x => x.Alias).ToArray(),
-                Rows = await Tokens.GetTokenBalances(filter, pagination, selection.select.Fields ?? selection.select.Values)
-            });
+                res = await Tokens.GetTokenBalances(filter, pagination);
+            }
+            else
+            {
+                res = new SelectionResponse
+                {
+                    Cols = selection.select.Fields?.Select(x => x.Alias).ToArray(),
+                    Rows = await Tokens.GetTokenBalances(filter, pagination, selection.select.Fields ?? selection.select.Values)
+                };
+            }
+            cached = ResponseCache.Set(query, res);
+            return this.Bytes(cached);
         }
         #endregion
 

diff --git a/Tzkt.Api/Parameters/AccountTypeParameter.cs b/Tzkt.Api/Parameters/AccountTypeParameter.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
 namespace Tzkt.Api
@@ -28,7 +29,19 @@ public class AccountTypeParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Ne != null)
+            {
+                sb.Append($"{name}.ne={Ne}&");
+            }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/AnyOfParameter.cs b/Tzkt.Api/Parameters/AnyOfParameter.cs
@@ -15,7 +15,7 @@ public class AnyOfParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            return $"{name}.{string.Join(".", Fields)}={Value}&";
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/BakingRightStatusParameter.cs b/Tzkt.Api/Parameters/BakingRightStatusParameter.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
 namespace Tzkt.Api
@@ -28,7 +29,19 @@ public class BakingRightStatusParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Ne != null)
+            {
+                sb.Append($"{name}.ne={Ne}&");
+            }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/BakingRightTypeParameter.cs b/Tzkt.Api/Parameters/BakingRightTypeParameter.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
 namespace Tzkt.Api
@@ -28,7 +29,19 @@ public class BakingRightTypeParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Ne != null)
+            {
+                sb.Append($"{name}.ne={Ne}&");
+            }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/BoolParameter.cs b/Tzkt.Api/Parameters/BoolParameter.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Text;
+using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
 namespace Tzkt.Api
@@ -25,7 +26,19 @@ public class BoolParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Null != null)
+            {
+                sb.Append($"{name}.null={Null}&");
+            }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/DateTimeParameter.cs b/Tzkt.Api/Parameters/DateTimeParameter.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
@@ -75,7 +77,49 @@ public class DateTimeParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Ne != null)
+            {
+                sb.Append($"{name}.ne={Ne}&");
+            }
+
+            if (Gt != null)
+            {
+                sb.Append($"{name}.gt={Gt}&");
+            }
+
+            if (Ge != null)
+            {
+                sb.Append($"{name}.ge={Ge}&");
+            }
+
+            if (Lt != null)
+            {
+                sb.Append($"{name}.lt={Lt}&");
+            }
+
+            if (Le != null)
+            {
+                sb.Append($"{name}.le={Le}&");
+            }
+
+            if (In?.Count > 0)
+            {
+                sb.Append($"{name}.in={string.Join(",", In.OrderBy(x => x))}&");
+            }
+
+            if (Ni?.Count > 0)
+            {
+                sb.Append($"{name}.ni={string.Join(",", Ni.OrderBy(x => x))}&");
+            }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/ExpressionParameter.cs b/Tzkt.Api/Parameters/ExpressionParameter.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
@@ -46,7 +48,29 @@ public class ExpressionParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Ne != null)
+            {
+                sb.Append($"{name}.ne={Ne}&");
+            }
+
+            if (In?.Count > 0)
+            {
+                sb.Append($"{name}.in={string.Join(",", In.OrderBy(x => x))}&");
+            }
+
+            if (Ni?.Count > 0)
+            {
+                sb.Append($"{name}.ni={string.Join(",", Ni.OrderBy(x => x))}&");
+            }
+
+            return sb.ToString();
         }
     }
 }
diff --git a/Tzkt.Api/Parameters/MigrationKindParameter.cs b/Tzkt.Api/Parameters/MigrationKindParameter.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Mvc;
 using NJsonSchema.Annotations;
 
@@ -47,7 +49,29 @@ public class MigrationKindParameter : INormalizable
 
         public string Normalize(string name)
         {
-            throw new System.NotImplementedException();
+            var sb = new StringBuilder();
+
+            if (Eq != null)
+            {
+                sb.Append($"{name}.eq={Eq}&");
+            }
+
+            if (Ne != null)
+            {
+                sb.Append($"{name}.ne={Ne}&");
+            }
+
+            if (In?.Count > 0)
+            {
+                sb.Append($"{name}.in={string.Join(",", In.OrderBy(x => x))}&");
+            }
+
+            if (Ni?.Count > 0)
+            {
+                sb.Append($"{name}.ni={string.Join(",", Ni.OrderBy(x => x))}&");
+            }
+
+            return sb.ToString();
         }
     }
 }