Automatically update cached metadata on post

baking-bad · Jun 30, 2021 · cb68333 · cb68333
1 parent c4380a9
commit cb68333
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 38 deletions.
diff --git a/Tzkt.Api/Controllers/AccountsController.cs b/Tzkt.Api/Controllers/AccountsController.cs
@@ -5,12 +5,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 
 using Tzkt.Api.Models;
 using Tzkt.Api.Repositories;
 using Tzkt.Api.Services.Cache;
-using Tzkt.Api.Services.Metadata;
 
 namespace Tzkt.Api.Controllers
 {

diff --git a/Tzkt.Api/Controllers/MetadataController.cs b/Tzkt.Api/Controllers/MetadataController.cs
@@ -7,8 +7,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
+
+using Tzkt.Api.Services;
 using Tzkt.Api.Services.Auth;
+using Tzkt.Api.Services.Cache;
 using Tzkt.Api.Repositories;
+using Tzkt.Api.Models;
 
 namespace Tzkt.Api.Controllers
 {
@@ -17,11 +21,17 @@ namespace Tzkt.Api.Controllers
     [Route("v1/metadata")]
     public class MetadataController : ControllerBase
     {
+        readonly AccountsCache Accounts;
+        readonly SoftwareCache Software;
+        readonly SearchService Search;
         readonly MetadataRepository Metadata;
         readonly IAuthService Auth;
 
-        public MetadataController(MetadataRepository metadata, IAuthService auth)
+        public MetadataController(AccountsCache accounts, SoftwareCache software, SearchService search, MetadataRepository metadata, IAuthService auth)
         {
+            Accounts = accounts;
+            Software = software;
+            Search = search;
             Metadata = metadata;
             Auth = auth;
         }
@@ -35,7 +45,7 @@ public async Task<ActionResult<IEnumerable<ObjectMetadata>>> GetAccountMetadata(
         {
             if (!Auth.TryAuthenticate(headers, out var error))
                 return Unauthorized(error);
-
+            
             return Ok(await Metadata.GetAccountMetadata(offset, limit));
         }
 
@@ -64,7 +74,31 @@ public async Task<ActionResult<IEnumerable<ObjectMetadata>>> UpdateAccountMetada
                 if (metadata.Any(x => !Regex.IsMatch(x.Key, "^(tz1|tz2|tz3|KT1)[0-9A-Za-z]{33}$")))
                     return BadRequest("Invalid account address");
 
-                return Ok(await Metadata.UpdateAccountMetadata(metadata));
+                var res = await Metadata.UpdateAccountMetadata(metadata);
+                #region update cached metadata
+                foreach (var item in res)
+                {
+                    var acc = Accounts.Get(item.Key);
+                    var prevAlias = acc.Alias;
+
+                    acc.Metadata = item.Metadata == null ? null :
+                        JsonSerializer.Deserialize<AccountMetadata>(item.Metadata.Json);
+
+                    if (prevAlias != acc.Alias)
+                    {
+                        lock (Search.Aliases)
+                        {
+                            if (prevAlias == null)
+                                Search.Aliases.Add(acc.Info);
+                            else if (acc.Alias == null)
+                                Search.Aliases.RemoveAll(x => x.Address == acc.Address);
+                            else
+                                Search.Aliases.First(x => x.Address == acc.Address).Name = acc.Alias;
+                        }
+                    }
+                }
+                #endregion
+                return Ok(res);
             }
             catch (JsonException ex)
             {
@@ -204,7 +238,9 @@ public async Task<ActionResult<IEnumerable<ObjectMetadata>>> UpdateSoftwareMetad
                 if (metadata.Any(x => !Regex.IsMatch(x.Key, "^[0-9a-f]{8}$")))
                     return BadRequest("Invalid software short hash");
 
-                return Ok(await Metadata.UpdateSoftwareMetadata(metadata));
+                var res = await Metadata.UpdateSoftwareMetadata(metadata);
+                if (res.Count > 0) Software.Initialize();
+                return Ok(res);
             }
             catch (JsonException ex)
             {

diff --git a/Tzkt.Api/Models/Accounts/Contract.cs b/Tzkt.Api/Models/Accounts/Contract.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Tzkt.Api.Services.Metadata;
 
 namespace Tzkt.Api.Models
 {

diff --git a/Tzkt.Api/Models/Accounts/Delegate.cs b/Tzkt.Api/Models/Accounts/Delegate.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-using Tzkt.Api.Services.Metadata;
 
 namespace Tzkt.Api.Models
 {

diff --git a/Tzkt.Api/Models/Accounts/User.cs b/Tzkt.Api/Models/Accounts/User.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-using Tzkt.Api.Services.Metadata;
 
 namespace Tzkt.Api.Models
 {

diff --git a/Tzkt.Api/Models/Voting/ProposalAlias.cs b/Tzkt.Api/Models/Voting/ProposalAlias.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Tzkt.Api.Services.Metadata;
-
-namespace Tzkt.Api.Models
+namespace Tzkt.Api.Models
 {
     public class ProposalAlias
     {

diff --git a/Tzkt.Api/Repositories/AccountRepository.cs b/Tzkt.Api/Repositories/AccountRepository.cs
@@ -10,7 +10,6 @@
 
 using Tzkt.Api.Models;
 using Tzkt.Api.Services.Cache;
-using Tzkt.Api.Services.Metadata;
 using Tzkt.Api.Utils;
 
 namespace Tzkt.Api.Repositories

diff --git a/Tzkt.Api/Repositories/BlockRepository.cs b/Tzkt.Api/Repositories/BlockRepository.cs
@@ -7,7 +7,6 @@
 
 using Tzkt.Api.Models;
 using Tzkt.Api.Services.Cache;
-using Tzkt.Api.Services.Metadata;
 
 namespace Tzkt.Api.Repositories
 {

diff --git a/Tzkt.Api/Services/Cache/Software/SoftwareCache.cs b/Tzkt.Api/Services/Cache/Software/SoftwareCache.cs
@@ -6,17 +6,16 @@
 using Microsoft.Extensions.Logging;
 using Dapper;
 using Tzkt.Api.Models;
-using Tzkt.Api.Services.Cache;
 
-namespace Tzkt.Api.Services.Metadata
+namespace Tzkt.Api.Services.Cache
 {
     public class SoftwareCache : DbConnection
     {
         public SoftwareAlias this[int id]
         {
             get
             {
-                lock (Aliases)
+                lock (this)
                 {
                     if (!Aliases.TryGetValue(id, out var alias))
                     {
@@ -42,7 +41,7 @@ public SoftwareAlias this[int id]
             }
         }
 
-        readonly Dictionary<int, SoftwareAlias> Aliases;
+        Dictionary<int, SoftwareAlias> Aliases;
         readonly TimeCache Time;
         readonly ILogger Logger;
 
@@ -52,21 +51,27 @@ public SoftwareCache(TimeCache time, IConfiguration config, ILogger<SoftwareCach
             Time = time;
 
             Logger.LogDebug("Initializing software cache...");
+            Initialize();
+            Logger.LogDebug("Loaded {0} software", Aliases.Count);
+        }
 
-            using var db = GetConnection();
-            var rows = db.Query(@"
+        public void Initialize()
+        {
+            lock (this)
+            {
+                using var db = GetConnection();
+                var rows = db.Query(@"
                 SELECT  ""Id"", ""FirstLevel"",
                         ""Metadata""->>'version' as ""Version"",
                         ""Metadata""->>'commitDate' as ""CommitDate""
                 FROM ""Software""");
 
-            Aliases = rows.ToDictionary(row => (int)row.Id, row => new SoftwareAlias
-            {
-                Version = row.Version,
-                Date = DateTimeOffset.TryParse(row.CommitDate, out DateTimeOffset dt) ? dt.DateTime : Time[row.FirstLevel]
-            });
-
-            Logger.LogDebug("Loaded {0} software", Aliases.Count);
+                Aliases = rows.ToDictionary(row => (int)row.Id, row => new SoftwareAlias
+                {
+                    Version = row.Version,
+                    Date = DateTimeOffset.TryParse(row.CommitDate, out DateTimeOffset dt) ? dt.DateTime : Time[row.FirstLevel]
+                });
+            }
         }
     }
 

diff --git a/Tzkt.Api/Startup.cs b/Tzkt.Api/Startup.cs
@@ -12,7 +12,6 @@
 using Tzkt.Api.Services;
 using Tzkt.Api.Services.Auth;
 using Tzkt.Api.Services.Cache;
-using Tzkt.Api.Services.Metadata;
 using Tzkt.Api.Services.Sync;
 using Tzkt.Api.Swagger;
 using Tzkt.Api.Websocket;