Merged in Dapper Repositories

src/Core/AdminConsole/Models/Data/Organizations/OrganizationIntegrationConfigurationDetails.cs

@@ -0,0 +1,33 @@
+using System.Text.Json.Nodes;
+using Bit.Core.Enums;
+
+#nullable enable
+
+namespace Bit.Core.Models.Data.Organizations;
+
+public class OrganizationIntegrationConfigurationDetails
+{
+    public Guid Id { get; set; }
+    public Guid OrganizationIntegrationId { get; set; }
+    public IntegrationType IntegrationType { get; set; }
+    public EventType EventType { get; set; }
+    public string? Configuration { get; set; }
+    public string? IntegrationConfiguration { get; set; }
+    public string? Template { get; set; }
+
+    public JsonObject MergedConfiguration
+    {
+        get
+        {
+            var configJson = JsonNode.Parse(Configuration ?? string.Empty) as JsonObject ?? new JsonObject();
+            var integrationJson = JsonNode.Parse(IntegrationConfiguration ?? string.Empty) as JsonObject ?? new JsonObject();
+
+            foreach (var kvp in configJson)
+            {
+                integrationJson[kvp.Key] = kvp.Value;
+            }
+
+            return integrationJson;
+        }
+    }
+}

src/Core/AdminConsole/Repositories/IOrganizationIntegrationConfigurationRepository.cs

@@ -1,11 +1,12 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Enums;
+using Bit.Core.Models.Data.Organizations;
 
 namespace Bit.Core.Repositories;
 
 public interface IOrganizationIntegrationConfigurationRepository : IRepository<OrganizationIntegrationConfiguration, Guid>
 {
-    Task<List<OrganizationIntegrationConfiguration>> GetConfigurationsAsync(
+    Task<List<OrganizationIntegrationConfigurationDetails>> GetConfigurationsAsync(
         Guid organizationId,
         IntegrationType integrationType,
         EventType eventType);

src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationIntegrationConfigurationRepository.cs

@@ -1,6 +1,7 @@
 using System.Data;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Enums;
+using Bit.Core.Models.Data.Organizations;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Infrastructure.Dapper.Repositories;
@@ -19,15 +20,15 @@ public class OrganizationIntegrationConfigurationRepository : Repository<Organiz
         : base(connectionString, readOnlyConnectionString)
     { }
 
-    public async Task<List<OrganizationIntegrationConfiguration>> GetConfigurationsAsync(
+    public async Task<List<OrganizationIntegrationConfigurationDetails>> GetConfigurationsAsync(
         Guid organizationId,
         IntegrationType integrationType,
         EventType eventType)
     {
         using (var connection = new SqlConnection(ConnectionString))
         {
-            var results = await connection.QueryAsync<OrganizationIntegrationConfiguration>(
+            var results = await connection.QueryAsync<OrganizationIntegrationConfigurationDetails>(
-                "[dbo].[OrganizationIntegrationConfiguration_ReadManyByEventTypeOrganizationIdIntegrationType]",
+                "[dbo].[OrganizationIntegrationConfigurationDetails_ReadManyByEventTypeOrganizationIdIntegrationType]",
                 new
                 {
                     EventType = eventType,