- New index in storage

- Avoid caching when migrating texts
- Make a2 websa html inline in browser
- Send new instance event properties back to sbl via SblInstanceEvent

src/Storage/Controllers/MigrationController.cs

@@ -23,7 +23,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc;
-
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
@@ -51,6 +51,7 @@ public class MigrationController : ControllerBase
         private readonly GeneralSettings _generalSettings;
         private readonly AzureStorageConfiguration _azureStorageSettings;
         private readonly HttpClient _httpClient;
+        private readonly IMemoryCache _memoryCache;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MigrationController"/> class
@@ -67,6 +68,7 @@ public class MigrationController : ControllerBase
         /// <param name="azureStorageSettings">the azureStorage settings.</param>
         /// <param name="generalSettings">Settings with endpoint uri</param>
         /// <param name="httpClient">The HttpClient to use in communication with the PDF generator service.</param>
+        /// <param name="memoryCache">the memory cache</param>
         public MigrationController(
             IInstanceRepository instanceRepository,
             IInstanceEventRepository instanceEventRepository,
@@ -79,7 +81,8 @@ public MigrationController(
             IOptions<GeneralSettings> settings,
             IOptions<AzureStorageConfiguration> azureStorageSettings,
             IOptions<GeneralSettings> generalSettings,
-            HttpClient httpClient)
+            HttpClient httpClient,
+            IMemoryCache memoryCache)
         {
             _instanceRepository = instanceRepository;
             _instanceEventRepository = instanceEventRepository;
@@ -93,6 +96,7 @@ public MigrationController(
             _azureStorageSettings = azureStorageSettings.Value;
             _httpClient = httpClient;
             _httpClient.BaseAddress = new Uri(generalSettings.Value.PdfGeneratorEndpoint);
+            _memoryCache = memoryCache;
         }
 
         /// <summary>
@@ -349,6 +353,12 @@ public async Task<ActionResult<Instance>> CreateText([FromRoute] string org, [Fr
         {
             try
             {
+                string cacheKey = $"tid:{org}-{app}-{language}";
+                if (_memoryCache.Get(cacheKey) != null)
+                {
+                    _memoryCache.Remove(cacheKey);
+                }
+
                 TextResource textResource = await _textRepository.Get(org, app, language);
                 using var reader = new StreamReader(Request.Body);
                 if (textResource == null)

src/Storage/Helpers/InstanceHelper.cs

@@ -83,7 +83,9 @@ public static List<SblInstanceEvent> ConvertToSBLInstanceEvent(List<InstanceEven
                         Id = instanceEvent.Id,
                         User = instanceEvent.User,
                         CreatedDateTime = instanceEvent.Created,
-                        EventType = instanceEvent.EventType
+                        EventType = instanceEvent.EventType,
+                        AdditionalInfo = instanceEvent.AdditionalInfo,
+                        RelatedUser = instanceEvent.RelatedUser
                     });
             }
 

src/Storage/Helpers/SblInstanceEvent.cs

@@ -33,7 +33,19 @@ public class SblInstanceEvent
         /// </summary>
         [JsonProperty(PropertyName = "user")]
         public PlatformUser User { get; set; }
-
+
+        /// <summary>
+        /// A user that is related to the event
+        /// </summary>
+        [JsonProperty(PropertyName = "relatedUser")]
+        public PlatformUser RelatedUser { get; set; }
+
+        /// <summary>
+        /// Additional information describing the event
+        /// </summary>
+        [JsonProperty(PropertyName = "additionalInfo")]
+        public string AdditionalInfo { get; set; }
+
         /// <inheritdoc/>
         public override string ToString()
         {

src/Storage/Migration/v0.16/01-create-index.sql

@@ -0,0 +1 @@
+CREATE INDEX IF NOT EXISTS instances_org_lastchanged ON storage.instances(org, lastChanged);

src/Storage/Migration/v0.16/02-functions-and-procedures.sql

@@ -0,0 +1 @@
+-- This script is autogenerated from the tool DbTools. Do not edit manually.