- storage.readallformultipledataelement parameter fix

- telemetryClient nullability - GetAllAppTitles TrimEnd - DeleteAllInstanceEvents, changed from nonquery to scalar - GetHardDeletedDataElements: made org test case insensitive
Altinn · Dec 5, 2023 · 5a46a0a · 5a46a0a
1 parent d5033ab
commit 5a46a0a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/Storage/Migration/v0.00/03-setup-functions.sql b/src/Storage/Migration/v0.00/03-setup-functions.sql
@@ -282,7 +282,7 @@ RETURN QUERY
 END;
 $BODY$;
 
-CREATE OR REPLACE FUNCTION storage.readallformultipledataelement(_instanceGuid UUID)
+CREATE OR REPLACE FUNCTION storage.readallformultipledataelement(_instanceGuid UUID[])
     RETURNS TABLE (element JSONB)
     LANGUAGE 'plpgsql'
 

diff --git a/src/Storage/Repository/PgApplicationRepository.cs b/src/Storage/Repository/PgApplicationRepository.cs
@@ -50,7 +50,7 @@ public PgApplicationRepository(
             IOptions<GeneralSettings> generalSettings,
             IMemoryCache memoryCache,
             NpgsqlDataSource dataSource,
-            TelemetryClient telemetryClient)
+            TelemetryClient telemetryClient = null)
         {
             _dataSource = dataSource;
             _telemetryClient = telemetryClient;
@@ -184,7 +184,7 @@ public async Task<Dictionary<string, string>> GetAllAppTitles()
                         }
                     }
 
-                    appTitles.Add(item.Id, titles.ToString());
+                    appTitles.Add(item.Id, titles.ToString().TrimEnd(';'));
                 }
 
                 _memoryCache.Set(_cacheKey, appTitles, _cacheEntryOptionsTitles);

diff --git a/src/Storage/Repository/PgDataRepository.cs b/src/Storage/Repository/PgDataRepository.cs
@@ -39,7 +39,7 @@ public class PgDataRepository : IDataRepository
         public PgDataRepository(
             ILogger<PgDataRepository> logger,
             NpgsqlDataSource dataSource,
-            TelemetryClient telemetryClient)
+            TelemetryClient telemetryClient = null)
         {
             _logger = logger;
             _dataSource = dataSource;

diff --git a/src/Storage/Repository/PgInstanceEventRepository.cs b/src/Storage/Repository/PgInstanceEventRepository.cs
@@ -38,7 +38,7 @@ public class PgInstanceEventRepository: IInstanceEventRepository
         public PgInstanceEventRepository(
             ILogger<PgInstanceEventRepository> logger,
             NpgsqlDataSource dataSource,
-            TelemetryClient telemetryClient)
+            TelemetryClient telemetryClient = null)
         {
             _dataSource = dataSource;
             _telemetryClient = telemetryClient;
@@ -113,7 +113,7 @@ public async Task<int> DeleteAllInstanceEvents(string instanceId)
             using TelemetryTracker tracker = new(_telemetryClient, pgcom);
             pgcom.Parameters.AddWithValue(NpgsqlDbType.Uuid, new Guid(instanceId.Split('/').Last()));
 
-            int rc = await pgcom.ExecuteNonQueryAsync();
+            int rc = (int)await pgcom.ExecuteScalarAsync();
             tracker.Track();
             return rc;
         }

diff --git a/src/Storage/Repository/PgInstanceRepository.cs b/src/Storage/Repository/PgInstanceRepository.cs
@@ -51,7 +51,7 @@ static PgInstanceRepository()
         public PgInstanceRepository(
             ILogger<PgInstanceRepository> logger,
             NpgsqlDataSource dataSource,
-            TelemetryClient telemetryClient)
+            TelemetryClient telemetryClient = null)
         {
             _logger = logger;
             _dataSource = dataSource;
@@ -143,7 +143,7 @@ public async Task<List<DataElement>> GetHardDeletedDataElements()
                         // TODO move filter to db function
                         currentInstanceAllowsDelete =
                             instance.CompleteConfirmations != null &&
-                            instance.CompleteConfirmations.Any(c => c.StakeholderId.ToLower().Equals(instance.Org) &&
+                            instance.CompleteConfirmations.Any(c => c.StakeholderId.Equals(instance.Org, StringComparison.OrdinalIgnoreCase) &&
                             c.ConfirmedOn <= DateTime.UtcNow.AddDays(-7));
                         previousId = id;
                     }

diff --git a/src/Storage/Repository/PgTextRepository.cs b/src/Storage/Repository/PgTextRepository.cs
@@ -49,7 +49,7 @@ public PgTextRepository(
             IOptions<GeneralSettings> generalSettings,
             IMemoryCache memoryCache,
             NpgsqlDataSource dataSource,
-            TelemetryClient telemetryClient)
+            TelemetryClient telemetryClient = null)
         {
             _memoryCache = memoryCache;
             _cacheEntryOptions = new MemoryCacheEntryOptions()